diff options
| author | Manohar Vanga <manohar.vanga@cern.ch> | 2011-09-26 11:27:17 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-17 15:43:13 -0700 |
| commit | a916a391d3e19593a104a8c3c4779a3084f1ca5b (patch) | |
| tree | 916dee131f0cb4914c73415a58b9652ee8881136 /drivers/staging/vme/vme.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/vme.c')
| -rw-r--r-- | drivers/staging/vme/vme.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/staging/vme/vme.c b/drivers/staging/vme/vme.c index 2abb9ebd3d63..b04b4688f705 100644 --- a/drivers/staging/vme/vme.c +++ b/drivers/staging/vme/vme.c @@ -1377,16 +1377,14 @@ static int __vme_register_driver_bus(struct vme_driver *drv, err = -ENOMEM; goto err_devalloc; } - vdev->id.num = i; - vdev->id.bus = bridge->num; - vdev->id.slot = i + 1; + vdev->num = i; vdev->bridge = bridge; vdev->dev.platform_data = drv; vdev->dev.release = vme_dev_release; vdev->dev.parent = bridge->parent; vdev->dev.bus = &vme_bus_type; - dev_set_name(&vdev->dev, "%s.%u-%u", drv->name, vdev->id.bus, - vdev->id.num); + dev_set_name(&vdev->dev, "%s.%u-%u", drv->name, bridge->num, + vdev->num); err = device_register(&vdev->dev); if (err) |