Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 20:22:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

VME: Rename vme_slot_get to avoid confusion with reference counting

Browse Source 
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>
This commit is contained in:
Martyn Welch 2013-11-08 11:58:35 +00:00 committed by Greg Kroah-Hartman
parent 978f47d643
commit d7729f0fc4
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/vme_api.txt
View File

@ -393,7 +393,7 @@ Slot Detection
This function returns the slot ID of the provided bridge.
int vme_slot_get(struct vme_dev *dev);
int vme_slot_num(struct vme_dev *dev);
Bus Detection

2
drivers/staging/vme/devices/vme_user.c
View File

@ -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))

6
drivers/vme/vme.c
View File

@ -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)
{

2
include/linux/vme.h
View File

@ -164,7 +164,7 @@ int vme_lm_attach(struct vme_resource *, int, void (*callback)(int));
int vme_lm_detach(struct vme_resource *, int);
void vme_lm_free(struct vme_resource *);
int vme_slot_get(struct vme_dev *);
int vme_slot_num(struct vme_dev *);
int vme_bus_num(struct vme_dev *);
int vme_register_driver(struct vme_driver *, unsigned int);