diff options
author | Manohar Vanga <manohar.vanga@cern.ch> | 2011-09-26 05:27:17 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-17 18:43:13 -0400 |
commit | a916a391d3e19593a104a8c3c4779a3084f1ca5b (patch) | |
tree | 916dee131f0cb4914c73415a58b9652ee8881136 /drivers/staging/vme/devices/vme_user.c | |
parent | 5d6abf379d73efe390488e8edba972af4e93cb1c (diff) |
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/devices/vme_user.c')
-rw-r--r-- | drivers/staging/vme/devices/vme_user.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c index c658ce9bd61..9518dda13ea 100644 --- a/drivers/staging/vme/devices/vme_user.c +++ b/drivers/staging/vme/devices/vme_user.c | |||
@@ -668,7 +668,7 @@ err_nocard: | |||
668 | 668 | ||
669 | static int vme_user_match(struct vme_dev *vdev) | 669 | static int vme_user_match(struct vme_dev *vdev) |
670 | { | 670 | { |
671 | if (vdev->id.num >= USER_BUS_MAX) | 671 | if (vdev->num >= USER_BUS_MAX) |
672 | return 0; | 672 | return 0; |
673 | return 1; | 673 | return 1; |
674 | } | 674 | } |