s/claim_device/device_claim/

diff --git a/bridge.c b/bridge.c
index ad981da864149b1c096a7e007d3d3a4223a10153..d11f10268ee2d6f55ed555db4a9854e4cdd513ec 100644 (file)
--- a/bridge.c
+++ b/bridge.c
@@ -49,7 +49,7 @@ bridge_enable_member(struct bridge_member *bm)
        if (!bm->present)
                return 0;
 
-       ret = claim_device(bm->dev.dev);
+       ret = device_claim(bm->dev.dev);
        if (ret < 0)
                goto error;
 

diff --git a/device.c b/device.c
index 6fa697b45220f60652cbc5503ec3fe588f637a26..e1be5f4d89284a9b3f0475b83a0874351bd963bc 100644 (file)
--- a/device.c
+++ b/device.c
@@ -124,7 +124,7 @@ static int set_device_state(struct device *dev, bool state)
        return 0;
 }
 
-int claim_device(struct device *dev)
+int device_claim(struct device *dev)
 {
        int ret;
 

diff --git a/device.h b/device.h
index 3c0c0021e2d891d04af5842e9c47fc64063d2db1..decbc74addbb0471f232f489474763ddffd93ead 100644 (file)
--- a/device.h
+++ b/device.h
@@ -137,7 +137,7 @@ void device_add_user(struct device_user *dep, struct device *iface);
 void device_remove_user(struct device_user *dep);
 
 void device_set_present(struct device *dev, bool state);
-int claim_device(struct device *dev);
+int device_claim(struct device *dev);
 void release_device(struct device *dev);
 int check_device_state(struct device *dev);
 

diff --git a/interface.c b/interface.c
index 22fe3001f6c291b87bb9509562d8eeb3e81aa107..1f73130db4f8b764fc4eb86769eaf85223ab35c9 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -103,7 +103,7 @@ __set_interface_up(struct interface *iface)
        if (iface->state != IFS_DOWN)
                return 0;
 
-       ret = claim_device(iface->main_dev.dev);
+       ret = device_claim(iface->main_dev.dev);
        if (ret)
                return ret;
 

diff --git a/vlan.c b/vlan.c
index 4b797999a5d84ba0981fa8b84c4707042d2be74b..85fe078eb118f11bf0f6007d2819bbc801105663 100644 (file)
--- a/vlan.c
+++ b/vlan.c
@@ -36,7 +36,7 @@ static int vlan_set_device_state(struct device *dev, bool up)
                return 0;
        }
 
-       ret = claim_device(vldev->dep.dev);
+       ret = device_claim(vldev->dep.dev);
        if (ret)
                return ret;