rename check_device_state to device_check_state

diff --git a/device.c b/device.c
index 23befa3..f9ad25a 100644 (file)
--- a/device.c
+++ b/device.c
@@ -167,7 +167,7 @@ void device_release(struct device_user *dep)
        device_broadcast_event(dev, DEV_EVENT_DOWN);
 }
 
        device_broadcast_event(dev, DEV_EVENT_DOWN);
 }
 

-int check_device_state(struct device *dev)
+int device_check_state(struct device *dev)

 {
        if (!dev->type->check_state)
                return 0;
 {
        if (!dev->type->check_state)
                return 0;


@@ -203,7 +203,7 @@ int device_init(struct device *dev, const struct device_type *type, const char *
        if (ret < 0)
                return ret;
 
        if (ret < 0)
                return ret;
 

-       check_device_state(dev);
+       device_check_state(dev);

 
        return 0;
 }
 
        return 0;
 }

diff --git a/device.h b/device.h
index 907b9c6..8ecb9ef 100644 (file)
--- a/device.h
+++ b/device.h
@@ -122,7 +122,7 @@ void device_remove_user(struct device_user *dep);
 void device_set_present(struct device *dev, bool state);
 int device_claim(struct device_user *dep);
 void device_release(struct device_user *dep);
 void device_set_present(struct device *dev, bool state);
 int device_claim(struct device_user *dep);
 void device_release(struct device_user *dep);

-int check_device_state(struct device *dev);
+int device_check_state(struct device *dev);

 
 static inline void
 device_free(struct device *dev)
 
 static inline void
 device_free(struct device *dev)

diff --git a/ubus.c b/ubus.c
index d5a7007..7e2d2ea 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -43,7 +43,7 @@ netifd_handle_device(struct ubus_context *ctx, struct ubus_object *obj,
        if (!add || (tb[DEV_FORCE] && blobmsg_get_u8(tb[DEV_FORCE])))
                device_set_present(dev, add);
        else
        if (!add || (tb[DEV_FORCE] && blobmsg_get_u8(tb[DEV_FORCE])))
                device_set_present(dev, add);
        else

-               check_device_state(dev);
+               device_check_state(dev);

 
        return 0;
 }
 
        return 0;
 }