s/init_virtual_device/device_init_virtual/

[project/netifd.git] / device.c

diff --git a/device.c b/device.c
index 120b1f0..6fa697b 100644 (file)
--- a/device.c
+++ b/device.c
@@ -79,7 +79,7 @@ device_create(struct blob_attr *attr, struct uci_section *s)
                if (!strcmp(blobmsg_data(cur), "bridge"))
                        dev = bridge_create(name, s);
        } else {
-               dev = get_device(name, true);
+               dev = device_get(name, true);
        }
 
        if (!dev)
@@ -98,7 +98,7 @@ static void __init dev_init(void)
 
 static void free_simple_device(struct device *dev)
 {
-       cleanup_device(dev);
+       device_cleanup(dev);
        free(dev);
 }
 
@@ -164,7 +164,7 @@ int check_device_state(struct device *dev)
        return dev->type->check_state(dev);
 }
 
-void init_virtual_device(struct device *dev, const struct device_type *type, const char *name)
+void device_init_virtual(struct device *dev, const struct device_type *type, const char *name)
 {
        assert(dev);
        assert(type);
@@ -177,11 +177,11 @@ void init_virtual_device(struct device *dev, const struct device_type *type, con
        dev->type = type;
 }
 
-int init_device(struct device *dev, const struct device_type *type, const char *ifname)
+int device_init(struct device *dev, const struct device_type *type, const char *ifname)
 {
        int ret;
 
-       init_virtual_device(dev, type, ifname);
+       device_init_virtual(dev, type, ifname);
 
        if (!dev->set_state)
                dev->set_state = set_device_state;
@@ -197,7 +197,7 @@ int init_device(struct device *dev, const struct device_type *type, const char *
        return 0;
 }
 
-struct device *get_device(const char *name, bool create)
+struct device *device_get(const char *name, bool create)
 {
        static const struct device_type simple_type = {
                .name = "Device",
@@ -218,12 +218,12 @@ struct device *get_device(const char *name, bool create)
                return NULL;
 
        dev = calloc(1, sizeof(*dev));
-       init_device(dev, &simple_type, name);
+       device_init(dev, &simple_type, name);
 
        return dev;
 }
 
-void cleanup_device(struct device *dev)
+void device_cleanup(struct device *dev)
 {
        struct device_user *dep, *tmp;
 
@@ -239,7 +239,7 @@ void cleanup_device(struct device *dev)
                avl_delete(&devices, &dev->avl);
 }
 
-void set_device_present(struct device *dev, bool state)
+void device_set_present(struct device *dev, bool state)
 {
        if (dev->present == state)
                return;
@@ -249,7 +249,7 @@ void set_device_present(struct device *dev, bool state)
        broadcast_device_event(dev, state ? DEV_EVENT_ADD : DEV_EVENT_REMOVE);
 }
 
-void add_device_user(struct device_user *dep, struct device *dev)
+void device_add_user(struct device_user *dep, struct device *dev)
 {
        dep->dev = dev;
        list_add(&dep->list, &dev->users);
@@ -260,7 +260,7 @@ void add_device_user(struct device_user *dep, struct device *dev)
        }
 }
 
-void remove_device_user(struct device_user *dep)
+void device_remove_user(struct device_user *dep)
 {
        struct device *dev = dep->dev;
 
@@ -268,7 +268,7 @@ void remove_device_user(struct device_user *dep)
 
        if (list_empty(&dev->users)) {
                /* all references have gone away, remove this device */
-               free_device(dev);
+               device_free(dev);
        }
 
        dep->dev = NULL;
@@ -283,6 +283,6 @@ device_free_all(void)
                if (!list_empty(&dev->users))
                        continue;
 
-               free_device(dev);
+               device_free(dev);
        }
 }