s/get_device/device_get/

diff --git a/bridge.c b/bridge.c
index aff41fbb16524f42429deb7a6fc1abea628cbab2..3372d2078e70a5e8de0d4963dc174be8cde8ce9b 100644 (file)
--- a/bridge.c
+++ b/bridge.c
@@ -199,7 +199,7 @@ bridge_add_member(struct bridge_state *bst, const char *name)
 {
        struct device *dev;
 
-       dev = get_device(name, true);
+       dev = device_get(name, true);
        if (!dev)
                return;
 
@@ -321,7 +321,7 @@ bridge_create(const char *name, struct uci_section *s)
        struct bridge_state *bst;
        struct device *dev;
 
-       dev = get_device(name, false);
+       dev = device_get(name, false);
        if (dev)
                return NULL;
 

diff --git a/device.c b/device.c
index a71d90834ea46e77fa8f164f2cb81fe5e4054ba9..3d787f97b981ed5c3b833938e79028fc6cb67f41 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)
@@ -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",

diff --git a/device.h b/device.h
index 33278c9b0679a9f7d00ebc4a8f1bc4e5021bb97d..732ef02bcfea416a1bd9c4cbc553e03e16e5d5a5 100644 (file)
--- a/device.h
+++ b/device.h
@@ -132,7 +132,7 @@ struct device *device_create(struct blob_attr *attr, struct uci_section *s);
 void init_virtual_device(struct device *dev, const struct device_type *type, const char *name);
 int init_device(struct device *iface, const struct device_type *type, const char *ifname);
 void device_cleanup(struct device *iface);
-struct device *get_device(const char *name, bool create);
+struct device *device_get(const char *name, bool create);
 void device_add_user(struct device_user *dep, struct device *iface);
 void device_remove_user(struct device_user *dep);
 

diff --git a/interface.c b/interface.c
index 95ee8ea1fc18f39f8bea60349049082af1686c1a..22fe3001f6c291b87bb9509562d8eeb3e81aa107 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -236,7 +236,7 @@ alloc_interface(const char *name, struct uci_section *s, struct blob_attr *attr)
        }
 
        if ((cur = tb[IFACE_ATTR_IFNAME])) {
-               dev = get_device(blobmsg_data(cur), true);
+               dev = device_get(blobmsg_data(cur), true);
                if (dev)
                        device_add_user(&iface->main_dev, dev);
        }

diff --git a/ubus.c b/ubus.c
index 2e98b2b116267cdeab88fb1e835e951ca22e2ec9..fc5837620fb7907533270d50ffc4165c156f0539 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -33,7 +33,7 @@ static int netifd_handle_device(struct ubus_context *ctx, struct ubus_object *ob
        if (!tb[DEV_NAME])
                return UBUS_STATUS_INVALID_ARGUMENT;
 
-       dev = get_device(blobmsg_data(tb[DEV_NAME]), false);
+       dev = device_get(blobmsg_data(tb[DEV_NAME]), false);
        if (!dev)
                return UBUS_STATUS_NOT_FOUND;
 

diff --git a/vlan.c b/vlan.c
index 88604d3e369790f5f7c3aa99c07358043986791f..208ff73d594e572c1cfc766e475c2dd7f0d51ee6 100644 (file)
--- a/vlan.c
+++ b/vlan.c
@@ -129,7 +129,7 @@ struct device *get_vlan_device_chain(const char *ifname, bool create)
                return NULL;
 
        s = split_vlan(buf);
-       iface = get_device(buf, create);
+       iface = device_get(buf, create);
        if (!iface && !create)
                goto error;