From: Martyn Welch <martyn.welch@gefanuc.com>
Date: Thu, 6 Aug 2009 08:43:07 +0000 (+0100)
Subject: Staging: vme: Extend VME core probing for special matches
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=a37b0dad8b3d278fa64482ccd2381c947f432bf7;p=linux-edison.git

Staging: vme: Extend VME core probing for special matches

Add the ability to define all slots and current slot in the VME buses bind
table.

Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/vme/vme.c b/drivers/staging/vme/vme.c
index 8ee11925b19..d6ad12e3cb5 100644
--- a/drivers/staging/vme/vme.c
+++ b/drivers/staging/vme/vme.c
@@ -1302,9 +1302,17 @@ static int vme_bus_match(struct device *dev, struct device_driver *drv)
 	while((driver->bind_table[i].bus != 0) ||
 		(driver->bind_table[i].slot != 0)) {
 
-		if ((bridge->num == driver->bind_table[i].bus) &&
-			(num == driver->bind_table[i].slot))
-			return 1;
+		if (bridge->num == driver->bind_table[i].bus) {
+			if (num == driver->bind_table[i].slot)
+				return 1;
+
+			if (driver->bind_table[i].slot == VME_SLOT_ALL)
+				return 1;
+
+			if ((driver->bind_table[i].slot == VME_SLOT_CURRENT) &&
+				(num == vme_slot_get(dev)))
+				return 1;
+		}
 		i++;
 	}
 
diff --git a/drivers/staging/vme/vme.h b/drivers/staging/vme/vme.h
index 5291782a71e..a092138e3a7 100644
--- a/drivers/staging/vme/vme.h
+++ b/drivers/staging/vme/vme.h
@@ -79,6 +79,9 @@ struct vme_resource {
 
 extern struct bus_type vme_bus_type;
 
+#define VME_SLOT_CURRENT	-1
+#define VME_SLOT_ALL		-2
+
 struct vme_device_id {
 	int bus;
 	int slot;