Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit c4b512bc832c6c6aab14acb2bd96940e867e5018

Authored by Geert Uytterhoeven
Committed by Benjamin Herrenschmidt
1 parent ba55bd7436
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

ps3rom: Use ps3_system_bus_[gs]et_drvdata() instead of direct access 

Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Acked-by: James E.J. Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

Showing 1 changed file with 5 additions and 5 deletions Side-by-side Diff

drivers/scsi/ps3rom.c
Diff comments   View file @ c4b512b
... ... @@ -299,7 +299,7 @@
299 299 return IRQ_HANDLED;
300 300 }
301 301  
302   - host = dev->sbd.core.driver_data;
  302 + host = ps3_system_bus_get_drvdata(&dev->sbd);
303 303 priv = shost_priv(host);
304 304 cmd = priv->curr_cmd;
305 305  
... ... @@ -387,7 +387,7 @@
387 387 }
388 388  
389 389 priv = shost_priv(host);
390   - dev->sbd.core.driver_data = host;
  390 + ps3_system_bus_set_drvdata(&dev->sbd, host);
391 391 priv->dev = dev;
392 392  
393 393 /* One device/LUN per SCSI bus */
... ... @@ -407,7 +407,7 @@
407 407  
408 408 fail_host_put:
409 409 scsi_host_put(host);
410   - dev->sbd.core.driver_data = NULL;
  410 + ps3_system_bus_set_drvdata(&dev->sbd, NULL);
411 411 fail_teardown:
412 412 ps3stor_teardown(dev);
413 413 fail_free_bounce:
414 414  
... ... @@ -418,12 +418,12 @@
418 418 static int ps3rom_remove(struct ps3_system_bus_device *_dev)
419 419 {
420 420 struct ps3_storage_device *dev = to_ps3_storage_device(&_dev->core);
421   - struct Scsi_Host *host = dev->sbd.core.driver_data;
  421 + struct Scsi_Host *host = ps3_system_bus_get_drvdata(&dev->sbd);
422 422  
423 423 scsi_remove_host(host);
424 424 ps3stor_teardown(dev);
425 425 scsi_host_put(host);
426   - dev->sbd.core.driver_data = NULL;
  426 + ps3_system_bus_set_drvdata(&dev->sbd, NULL);
427 427 kfree(dev->bounce_buf);
428 428 return 0;
429 429 }