summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMartyn Welch <martyn.welch@ge.com>2013-11-08 11:58:35 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-03 11:15:58 -0800
commitd7729f0fc40296f91b483dfb929e71b27cf75345 (patch)
tree6c6d2a0f7645831c5d0908bec40fa786814f2699 /drivers
parent978f47d64365fa1659178e54c5106154c315b595 (diff)
VME: Rename vme_slot_get to avoid confusion with reference counting
Traditionally the "get" functions increment the reference count of the object that is returned, which does not happen with vme_slot_get. The function vme_slot_get returns the physical VME slot associated with a particular struct vme_dev. Rename vme_slot_num to avoid any confusion. Signed-off-by: Martyn Welch <martyn.welch@ge.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/vme/devices/vme_user.c2
-rw-r--r--drivers/vme/vme.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c
index caee906f9b38..bc4f8623c8cc 100644
--- a/drivers/staging/vme/devices/vme_user.c
+++ b/drivers/staging/vme/devices/vme_user.c
@@ -666,7 +666,7 @@ static int vme_user_match(struct vme_dev *vdev)
int i;
int cur_bus = vme_bus_num(vdev);
- int cur_slot = vme_slot_get(vdev);
+ int cur_slot = vme_slot_num(vdev);
for (i = 0; i < bus_num; i++)
if ((cur_bus == bus[i]) && (cur_slot == vdev->num))
diff --git a/drivers/vme/vme.c b/drivers/vme/vme.c
index 8df5e4efc1ca..96562c9a8b1b 100644
--- a/drivers/vme/vme.c
+++ b/drivers/vme/vme.c
@@ -1274,7 +1274,7 @@ void vme_lm_free(struct vme_resource *resource)
}
EXPORT_SYMBOL(vme_lm_free);
-int vme_slot_get(struct vme_dev *vdev)
+int vme_slot_num(struct vme_dev *vdev)
{
struct vme_bridge *bridge;
@@ -1285,13 +1285,13 @@ int vme_slot_get(struct vme_dev *vdev)
}
if (bridge->slot_get == NULL) {
- printk(KERN_WARNING "vme_slot_get not supported\n");
+ printk(KERN_WARNING "vme_slot_num not supported\n");
return -EINVAL;
}
return bridge->slot_get(bridge);
}
-EXPORT_SYMBOL(vme_slot_get);
+EXPORT_SYMBOL(vme_slot_num);
int vme_bus_num(struct vme_dev *vdev)
{