mirror of https://gitee.com/openkylin/linux.git
ps3flash: Use ps3_system_bus_[gs]et_drvdata() instead of direct access
Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
parent
03fa68c245
commit
559dc87f50
|
@ -108,7 +108,7 @@ static ssize_t ps3flash_read(struct file *file, char __user *buf, size_t count,
|
|||
loff_t *pos)
|
||||
{
|
||||
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;
|
||||
ssize_t sectors_read;
|
||||
size_t remaining, n;
|
||||
|
@ -173,7 +173,7 @@ static ssize_t ps3flash_write(struct file *file, const char __user *buf,
|
|||
size_t count, loff_t *pos)
|
||||
{
|
||||
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,
|
||||
end_read_sector, start_read_sector, head, tail, offset;
|
||||
ssize_t res;
|
||||
|
@ -366,7 +366,7 @@ static int __devinit ps3flash_probe(struct ps3_system_bus_device *_dev)
|
|||
goto fail;
|
||||
}
|
||||
|
||||
dev->sbd.core.driver_data = priv;
|
||||
ps3_system_bus_set_drvdata(&dev->sbd, priv);
|
||||
mutex_init(&priv->mutex);
|
||||
|
||||
dev->bounce_size = ps3flash_bounce_buffer.size;
|
||||
|
@ -392,7 +392,7 @@ static int __devinit ps3flash_probe(struct ps3_system_bus_device *_dev)
|
|||
ps3stor_teardown(dev);
|
||||
fail_free_priv:
|
||||
kfree(priv);
|
||||
dev->sbd.core.driver_data = NULL;
|
||||
ps3_system_bus_set_drvdata(&dev->sbd, NULL);
|
||||
fail:
|
||||
ps3flash_dev = NULL;
|
||||
return error;
|
||||
|
@ -404,8 +404,8 @@ static int ps3flash_remove(struct ps3_system_bus_device *_dev)
|
|||
|
||||
misc_deregister(&ps3flash_misc);
|
||||
ps3stor_teardown(dev);
|
||||
kfree(dev->sbd.core.driver_data);
|
||||
dev->sbd.core.driver_data = NULL;
|
||||
kfree(ps3_system_bus_get_drvdata(&dev->sbd));
|
||||
ps3_system_bus_set_drvdata(&dev->sbd, NULL);
|
||||
ps3flash_dev = NULL;
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue