s/cleanup_device/device_cleanup/

[project/netifd.git] / vlan.c

diff --git a/vlan.c b/vlan.c
index 3de1121..88604d3 100644 (file)
--- a/vlan.c
+++ b/vlan.c
@@ -18,8 +18,8 @@ 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);
-       cleanup_device(&vldev->dev);
+       device_remove_user(&vldev->dep);
+       device_cleanup(&vldev->dev);
        free(vldev);
 }
 
@@ -55,10 +55,10 @@ static void vlan_dev_cb(struct device_user *dep, enum device_event ev)
        vldev = container_of(dep, struct vlan_device, dep);
        switch(ev) {
        case DEV_EVENT_ADD:
-               set_device_present(&vldev->dev, true);
+               device_set_present(&vldev->dev, true);
                break;
        case DEV_EVENT_REMOVE:
-               set_device_present(&vldev->dev, false);
+               device_set_present(&vldev->dev, false);
                break;
        default:
                break;
@@ -100,12 +100,12 @@ static struct device *get_vlan_device(struct device *dev, int id, bool create)
        vldev->id = id;
 
        vldev->dep.cb = vlan_dev_cb;
-       add_device_user(&vldev->dep, dev);
+       device_add_user(&vldev->dep, dev);
 
        return &vldev->dev;
 }
 
-static inline char *split_vlan(char *s)
+static char *split_vlan(char *s)
 {
        s = strchr(s, '.');
        if (!s)