projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dmaengine: omap-dma: cleanup errata 3.3 handling
[cascardo/linux.git]
/
drivers
/
vme
/
vme.c
diff --git
a/drivers/vme/vme.c
b/drivers/vme/vme.c
index
f6856b4
..
7516030
100644
(file)
--- 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);
}
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;
{
struct vme_bridge *bridge;
@@
-1285,14
+1285,27
@@
int vme_slot_get(struct vme_dev *vdev)
}
if (bridge->slot_get == NULL) {
}
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);
}
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)
+{
+ struct vme_bridge *bridge;
+
+ bridge = vdev->bridge;
+ if (bridge == NULL) {
+ pr_err("Can't find VME bus\n");
+ return -EINVAL;
+ }
+
+ return bridge->num;
+}
+EXPORT_SYMBOL(vme_bus_num);
/* - Bridge Registration --------------------------------------------------- */
/* - Bridge Registration --------------------------------------------------- */
@@
-1512,9
+1525,5
@@
static void __exit vme_exit(void)
bus_unregister(&vme_bus_type);
}
bus_unregister(&vme_bus_type);
}
-MODULE_DESCRIPTION("VME bridge driver framework");
-MODULE_AUTHOR("Martyn Welch <martyn.welch@ge.com");
-MODULE_LICENSE("GPL");
-
-module_init(vme_init);
+subsys_initcall(vme_init);
module_exit(vme_exit);
module_exit(vme_exit);