s/remove_device_user/device_remove_user/g

diff --git a/bridge.c b/bridge.c
index 2a9cc282af864a5dab12d89320e3317741995022..4ef98e66080649fab138466e0199182cf4e3a3bd 100644 (file)
--- a/bridge.c
+++ b/bridge.c
@@ -190,7 +190,7 @@ bridge_free_member(struct bridge_member *bm)
        }
 
        list_del(&bm->list);
-       remove_device_user(&bm->dev);
+       device_remove_user(&bm->dev);
        free(bm);
 }
 

diff --git a/device.c b/device.c
index 239b547abfd193d825615bb38f09c1986ead3691..4951cb2cd82dea5921e413fc6c67de9bafbfcc67 100644 (file)
--- a/device.c
+++ b/device.c
@@ -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;
 

diff --git a/device.h b/device.h
index 913f3a981176daf2149abfb3f1a87cf454fd2727..3c9717b1f12efbfdb3fefc3b227ed28efdbc88ad 100644 (file)
--- a/device.h
+++ b/device.h
@@ -134,7 +134,7 @@ int init_device(struct device *iface, const struct device_type *type, const char
 void cleanup_device(struct device *iface);
 struct device *get_device(const char *name, bool create);
 void add_device_user(struct device_user *dep, struct device *iface);
-void remove_device_user(struct device_user *dep);
+void device_remove_user(struct device_user *dep);
 
 void set_device_present(struct device *dev, bool state);
 int claim_device(struct device *dev);

diff --git a/interface.c b/interface.c
index c448e4dac2e6047b745f0f950791c4da3a3bc7e0..9fa3799542c31028c1751e64813148cd8c88d8c4 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -276,7 +276,7 @@ interface_remove_link(struct interface *iface, struct device *dev)
                return;
        }
 
-       remove_device_user(&iface->main_dev);
+       device_remove_user(&iface->main_dev);
 }
 
 int

diff --git a/vlan.c b/vlan.c
index c417f75c71c28f722725f941d8c133c53f7c1e47..1755777235c0f2aca2daa51aa45004e3e042b00b 100644 (file)
--- a/vlan.c
+++ b/vlan.c
@@ -18,7 +18,7 @@ static void free_vlan_if(struct device *iface)
        struct vlan_device *vldev;
 
        vldev = container_of(iface, struct vlan_device, dev);
-       remove_device_user(&vldev->dep);
+       device_remove_user(&vldev->dep);
        cleanup_device(&vldev->dev);
        free(vldev);
 }