diff options
| author | Manohar Vanga | 2011-09-26 11:27:17 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-10-18 00:43:13 +0200 |
| commit | a916a391d3e19593a104a8c3c4779a3084f1ca5b (patch) | |
| tree | 916dee131f0cb4914c73415a58b9652ee8881136 /drivers/staging/vme/vme.h | |
| parent | staging: vme: make match() driver specific to improve non-VME64x support (diff) | |
| download | kernel-qcow2-linux-a916a391d3e19593a104a8c3c4779a3084f1ca5b.tar.gz kernel-qcow2-linux-a916a391d3e19593a104a8c3c4779a3084f1ca5b.tar.xz kernel-qcow2-linux-a916a391d3e19593a104a8c3c4779a3084f1ca5b.zip | |
staging: vme: get rid of struct vme_device_id and slots
Previously, the device-driver matching mechanism depended on the
vme_device_id structure due to the need for a bind table per driver.
This method of matching is no longer used so this patch merges the
fields of struct vme_device_id into struct vme_dev. Since this also
renders the slot field meaningless, it has also been removed in this
patch.
Signed-off-by: Manohar Vanga <manohar.vanga@cern.ch>
Cc: Martyn Welch <martyn.welch@ge.com>
Reviewed-by: Emilio G. Cota <cota@braap.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vme/vme.h')
| -rw-r--r-- | drivers/staging/vme/vme.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/staging/vme/vme.h b/drivers/staging/vme/vme.h index 95224d7452ea..e3828badca61 100644 --- a/drivers/staging/vme/vme.h +++ b/drivers/staging/vme/vme.h @@ -96,18 +96,6 @@ extern struct bus_type vme_bus_type; #define VME_SLOT_ALL -2 /** - * VME device identifier structure - * @num: The device ID (ranges from 0 to N-1 for N devices) - * @bus: The bus ID of the bus the device is on - * @slot: The slot this device is plugged into - */ -struct vme_device_id { - int num; - int bus; - int slot; -}; - -/** * Structure representing a VME device * @id: The ID of the device (currently the bus and slot number) * @bridge: Pointer to the bridge device this device is on @@ -116,7 +104,7 @@ struct vme_device_id { * @bridge_list: List of devices (per bridge) */ struct vme_dev { - struct vme_device_id id; + int num; struct vme_bridge *bridge; struct device dev; struct list_head drv_list; |