ibmvscsi: gadget: at91_udc: remove driver_data direct access of struct device
Subsystems (3)
PATCH 1/1 ibmvscsi: gadget: at91_udc: remove driver_data direct access of struct device
From: Greg Kroah-Hartman <[email protected]>
In the near future, the driver core is going to not allow direct access to the driver_data pointer in struct device. Instead, the functions dev_get_drvdata() and dev_set_drvdata() should be used. These functions have been around since the beginning, so are backwards compatible with all older kernel versions.
Cc James Bottomley <[email protected]>
Cc Brian King <[email protected]>
Cc Robert Jennings <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
--- drivers/scsi/ibmvscsi/ibmvscsi.c | 6 +++--- drivers/scsi/ibmvscsi/ibmvstgt.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/scsi/ibmvscsi/ibmvscsi.c +3 -3
@@ -1657,7 +1657,7 @@ static int ibmvscsi_probe(struct vio_devunsigned long wait_switch =0 ;int rc; - vdev->dev.driver_data =NULL ; +dev_set_drvdata (&vdev->dev,NULL ); host =scsi_host_alloc (&driver_template,sizeof (*hostdata));if (!host) {
@@ -1723,7 +1723,7 @@ static int ibmvscsi_probe(struct vio_devscsi_scan_host (host); } - vdev->dev.driver_data = hostdata; +dev_set_drvdata (&vdev->dev, hostdata);return 0 ; add_srp_port_failed:
@@ -1740,7 +1740,7 @@ static int ibmvscsi_probe(struct vio_devstatic int ibmvscsi_remove (struct vio_dev *vdev) { -struct ibmvscsi_host_data *hostdata = vdev->dev.driver_data; +struct ibmvscsi_host_data *hostdata =dev_get_drvdata (&vdev->dev);release_event_pool (&hostdata->pool, hostdata); ibmvscsi_ops->release_crq_queue (&hostdata->queue, hostdata, max_events);
drivers/scsi/ibmvscsi/ibmvstgt.c +1 -1
@@ -892,7 +892,7 @@ free_vport:static int ibmvstgt_remove (struct vio_dev *dev) { -struct srp_target *target = (struct srp_target *) dev->dev.driver_data; +struct srp_target *target =dev_get_drvdata (&dev->dev);struct Scsi_Host *shost = target->shost;struct vio_port *vport = target->ldata;