s/remove_device_user/device_remove_user/g

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

-       remove_device_user(&bm->dev);
+       device_remove_user(&bm->dev);

        free(bm);
 }
 
        free(bm);
 }
 

diff --git a/device.c b/device.c
index 239b547..4951cb2 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;
 
 {
        struct device *dev = dep->dev;
 

diff --git a/device.h b/device.h
index 913f3a9..3c9717b 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 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);
 
 void set_device_present(struct device *dev, bool state);
 int claim_device(struct device *dev);

diff --git a/interface.c b/interface.c
index c448e4d..9fa3799 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -276,7 +276,7 @@ interface_remove_link(struct interface *iface, struct device *dev)
                return;
        }
 
                return;
        }
 

-       remove_device_user(&iface->main_dev);
+       device_remove_user(&iface->main_dev);

 }
 
 int
 }
 
 int

diff --git a/vlan.c b/vlan.c
index c417f75..1755777 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);
        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);
 }
        cleanup_device(&vldev->dev);
        free(vldev);
 }