Commit 559dc87f authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Benjamin Herrenschmidt

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

Signed-off-by: default avatarGeert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 03fa68c2
...@@ -108,7 +108,7 @@ static ssize_t ps3flash_read(struct file *file, char __user *buf, size_t count, ...@@ -108,7 +108,7 @@ static ssize_t ps3flash_read(struct file *file, char __user *buf, size_t count,
loff_t *pos) loff_t *pos)
{ {
struct ps3_storage_device *dev = ps3flash_dev; struct ps3_storage_device *dev = ps3flash_dev;
struct ps3flash_private *priv = dev->sbd.core.driver_data; struct ps3flash_private *priv = ps3_system_bus_get_drvdata(&dev->sbd);
u64 size, start_sector, end_sector, offset; u64 size, start_sector, end_sector, offset;
ssize_t sectors_read; ssize_t sectors_read;
size_t remaining, n; size_t remaining, n;
...@@ -173,7 +173,7 @@ static ssize_t ps3flash_write(struct file *file, const char __user *buf, ...@@ -173,7 +173,7 @@ static ssize_t ps3flash_write(struct file *file, const char __user *buf,
size_t count, loff_t *pos) size_t count, loff_t *pos)
{ {
struct ps3_storage_device *dev = ps3flash_dev; struct ps3_storage_device *dev = ps3flash_dev;
struct ps3flash_private *priv = dev->sbd.core.driver_data; struct ps3flash_private *priv = ps3_system_bus_get_drvdata(&dev->sbd);
u64 size, chunk_sectors, start_write_sector, end_write_sector, u64 size, chunk_sectors, start_write_sector, end_write_sector,
end_read_sector, start_read_sector, head, tail, offset; end_read_sector, start_read_sector, head, tail, offset;
ssize_t res; ssize_t res;
...@@ -366,7 +366,7 @@ static int __devinit ps3flash_probe(struct ps3_system_bus_device *_dev) ...@@ -366,7 +366,7 @@ static int __devinit ps3flash_probe(struct ps3_system_bus_device *_dev)
goto fail; goto fail;
} }
dev->sbd.core.driver_data = priv; ps3_system_bus_set_drvdata(&dev->sbd, priv);
mutex_init(&priv->mutex); mutex_init(&priv->mutex);
dev->bounce_size = ps3flash_bounce_buffer.size; dev->bounce_size = ps3flash_bounce_buffer.size;
...@@ -392,7 +392,7 @@ static int __devinit ps3flash_probe(struct ps3_system_bus_device *_dev) ...@@ -392,7 +392,7 @@ static int __devinit ps3flash_probe(struct ps3_system_bus_device *_dev)
ps3stor_teardown(dev); ps3stor_teardown(dev);
fail_free_priv: fail_free_priv:
kfree(priv); kfree(priv);
dev->sbd.core.driver_data = NULL; ps3_system_bus_set_drvdata(&dev->sbd, NULL);
fail: fail:
ps3flash_dev = NULL; ps3flash_dev = NULL;
return error; return error;
...@@ -404,8 +404,8 @@ static int ps3flash_remove(struct ps3_system_bus_device *_dev) ...@@ -404,8 +404,8 @@ static int ps3flash_remove(struct ps3_system_bus_device *_dev)
misc_deregister(&ps3flash_misc); misc_deregister(&ps3flash_misc);
ps3stor_teardown(dev); ps3stor_teardown(dev);
kfree(dev->sbd.core.driver_data); kfree(ps3_system_bus_get_drvdata(&dev->sbd));
dev->sbd.core.driver_data = NULL; ps3_system_bus_set_drvdata(&dev->sbd, NULL);
ps3flash_dev = NULL; ps3flash_dev = NULL;
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment