diff options
author | Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com> | 2009-06-10 00:38:56 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-16 00:15:46 -0400 |
commit | c4b512bc832c6c6aab14acb2bd96940e867e5018 (patch) | |
tree | 59acf1e9bd14b1b5e6e7aedf6ceef11103137184 /drivers/scsi/ps3rom.c | |
parent | ba55bd74360ea4b8b95e73ed79474d37ff482b36 (diff) |
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>
Diffstat (limited to 'drivers/scsi/ps3rom.c')
-rw-r--r-- | drivers/scsi/ps3rom.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/ps3rom.c b/drivers/scsi/ps3rom.c index ca0dd33497ec..db90caf43f42 100644 --- a/drivers/scsi/ps3rom.c +++ b/drivers/scsi/ps3rom.c | |||
@@ -299,7 +299,7 @@ static irqreturn_t ps3rom_interrupt(int irq, void *data) | |||
299 | return IRQ_HANDLED; | 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 | priv = shost_priv(host); | 303 | priv = shost_priv(host); |
304 | cmd = priv->curr_cmd; | 304 | cmd = priv->curr_cmd; |
305 | 305 | ||
@@ -387,7 +387,7 @@ static int __devinit ps3rom_probe(struct ps3_system_bus_device *_dev) | |||
387 | } | 387 | } |
388 | 388 | ||
389 | priv = shost_priv(host); | 389 | priv = shost_priv(host); |
390 | dev->sbd.core.driver_data = host; | 390 | ps3_system_bus_set_drvdata(&dev->sbd, host); |
391 | priv->dev = dev; | 391 | priv->dev = dev; |
392 | 392 | ||
393 | /* One device/LUN per SCSI bus */ | 393 | /* One device/LUN per SCSI bus */ |
@@ -407,7 +407,7 @@ static int __devinit ps3rom_probe(struct ps3_system_bus_device *_dev) | |||
407 | 407 | ||
408 | fail_host_put: | 408 | fail_host_put: |
409 | scsi_host_put(host); | 409 | scsi_host_put(host); |
410 | dev->sbd.core.driver_data = NULL; | 410 | ps3_system_bus_set_drvdata(&dev->sbd, NULL); |
411 | fail_teardown: | 411 | fail_teardown: |
412 | ps3stor_teardown(dev); | 412 | ps3stor_teardown(dev); |
413 | fail_free_bounce: | 413 | fail_free_bounce: |
@@ -418,12 +418,12 @@ fail_free_bounce: | |||
418 | static int ps3rom_remove(struct ps3_system_bus_device *_dev) | 418 | static int ps3rom_remove(struct ps3_system_bus_device *_dev) |
419 | { | 419 | { |
420 | struct ps3_storage_device *dev = to_ps3_storage_device(&_dev->core); | 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 | scsi_remove_host(host); | 423 | scsi_remove_host(host); |
424 | ps3stor_teardown(dev); | 424 | ps3stor_teardown(dev); |
425 | scsi_host_put(host); | 425 | scsi_host_put(host); |
426 | dev->sbd.core.driver_data = NULL; | 426 | ps3_system_bus_set_drvdata(&dev->sbd, NULL); |
427 | kfree(dev->bounce_buf); | 427 | kfree(dev->bounce_buf); |
428 | return 0; | 428 | return 0; |
429 | } | 429 | } |