block/ps3: remove driver_data direct access of struct device

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.

[Geert: Use ps3_system_bus_[gs]et_driver_data() for ps3_system_bus_device]

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Cc: Jim Paris <jim@jtan.com>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

1 files changed, 14 insertions, 9 deletions

diff --git a/drivers/block/ps3disk.c b/drivers/block/ps3disk.c
index aaeeb544228a..fdd2d7a00338 100644
--- a/drivers/block/ps3disk.c
+++ b/drivers/block/ps3disk.c
@@ -120,7 +120,8 @@ static void ps3disk_scatter_gather(struct ps3_storage_device *dev,
 static int ps3disk_submit_request_sg(struct ps3_storage_device *dev,
                                      struct request *req)
 {
-        struct ps3disk_private *priv = dev->sbd.core.driver_data;
+        struct ps3disk_private *priv =
+                ps3_system_bus_get_driver_data(&dev->sbd);
         int write = rq_data_dir(req), res;
         const char *op = write ? "write" : "read";
         u64 start_sector, sectors;
@@ -168,7 +169,8 @@ static int ps3disk_submit_request_sg(struct ps3_storage_device *dev,
 static int ps3disk_submit_flush_request(struct ps3_storage_device *dev,
                                         struct request *req)
 {
-        struct ps3disk_private *priv = dev->sbd.core.driver_data;
+        struct ps3disk_private *priv =
+                ps3_system_bus_get_driver_data(&dev->sbd);
         u64 res;
 
         dev_dbg(&dev->sbd.core, "%s:%u: flush request\n", __func__, __LINE__);
@@ -213,7 +215,8 @@ static void ps3disk_do_request(struct ps3_storage_device *dev,
 static void ps3disk_request(struct request_queue *q)
 {
         struct ps3_storage_device *dev = q->queuedata;
-        struct ps3disk_private *priv = dev->sbd.core.driver_data;
+        struct ps3disk_private *priv =
+                ps3_system_bus_get_driver_data(&dev->sbd);
 
         if (priv->req) {
                 dev_dbg(&dev->sbd.core, "%s:%u busy\n", __func__, __LINE__);
@@ -245,7 +248,7 @@ static irqreturn_t ps3disk_interrupt(int irq, void *data)
                 return IRQ_HANDLED;
         }
 
-        priv = dev->sbd.core.driver_data;
+        priv = ps3_system_bus_get_driver_data(&dev->sbd);
         req = priv->req;
         if (!req) {
                 dev_dbg(&dev->sbd.core,
@@ -364,7 +367,8 @@ static void ata_id_c_string(const u16 *id, unsigned char *s, unsigned int ofs,
 
 static int ps3disk_identify(struct ps3_storage_device *dev)
 {
-        struct ps3disk_private *priv = dev->sbd.core.driver_data;
+        struct ps3disk_private *priv =
+                ps3_system_bus_get_driver_data(&dev->sbd);
         struct lv1_ata_cmnd_block ata_cmnd;
         u16 *id = dev->bounce_buf;
         u64 res;
@@ -445,7 +449,7 @@ static int __devinit ps3disk_probe(struct ps3_system_bus_device *_dev)
                 goto fail;
         }
 
-        dev->sbd.core.driver_data = priv;
+        ps3_system_bus_set_driver_data(_dev, priv);
         spin_lock_init(&priv->lock);
 
         dev->bounce_size = BOUNCE_SIZE;
@@ -523,7 +527,7 @@ fail_free_bounce:
         kfree(dev->bounce_buf);
 fail_free_priv:
         kfree(priv);
-        dev->sbd.core.driver_data = NULL;
+        ps3_system_bus_set_driver_data(_dev, NULL);
 fail:
         mutex_lock(&ps3disk_mask_mutex);
         __clear_bit(devidx, &ps3disk_mask);
@@ -534,7 +538,8 @@ fail:
 static int ps3disk_remove(struct ps3_system_bus_device *_dev)
 {
         struct ps3_storage_device *dev = to_ps3_storage_device(&_dev->core);
-        struct ps3disk_private *priv = dev->sbd.core.driver_data;
+        struct ps3disk_private *priv =
+                ps3_system_bus_get_driver_data(&dev->sbd);
 
         mutex_lock(&ps3disk_mask_mutex);
         __clear_bit(MINOR(disk_devt(priv->gendisk)) / PS3DISK_MINORS,
@@ -548,7 +553,7 @@ static int ps3disk_remove(struct ps3_system_bus_device *_dev)
         ps3stor_teardown(dev);
         kfree(dev->bounce_buf);
         kfree(priv);
-        dev->sbd.core.driver_data = NULL;
+        ps3_system_bus_set_driver_data(_dev, NULL);
         return 0;
 }