From: Felix Fietkau Date: Fri, 29 Jul 2011 17:26:01 +0000 (+0200) Subject: s/claim_device/device_claim/ X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=commitdiff_plain;h=170304603e7d905e98301c703ad2ec107b9a774c s/claim_device/device_claim/ --- diff --git a/bridge.c b/bridge.c index ad981da..d11f102 100644 --- 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 6fa697b..e1be5f4 100644 --- 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 3c0c002..decbc74 100644 --- 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 22fe300..1f73130 100644 --- 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 4b79799..85fe078 100644 --- 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;