Commit 03fa68c2 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Benjamin Herrenschmidt

ps3: shorten ps3_system_bus_[gs]et_driver_data to ps3_system_bus_[gs]et_drvdata

Signed-off-by: default avatarGeert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Cc: Geoff Levand <geoffrey.levand@am.sony.com>
Cc: Jim Paris <jim@jtan.com>
Acked-by: default avatarGeoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 9f08e9db
...@@ -418,12 +418,12 @@ static inline struct ps3_system_bus_driver * ...@@ -418,12 +418,12 @@ static inline struct ps3_system_bus_driver *
* @data: Data to set * @data: Data to set
*/ */
static inline void ps3_system_bus_set_driver_data( static inline void ps3_system_bus_set_drvdata(
struct ps3_system_bus_device *dev, void *data) struct ps3_system_bus_device *dev, void *data)
{ {
dev_set_drvdata(&dev->core, data); dev_set_drvdata(&dev->core, data);
} }
static inline void *ps3_system_bus_get_driver_data( static inline void *ps3_system_bus_get_drvdata(
struct ps3_system_bus_device *dev) struct ps3_system_bus_device *dev)
{ {
return dev_get_drvdata(&dev->core); return dev_get_drvdata(&dev->core);
......
...@@ -120,8 +120,7 @@ static void ps3disk_scatter_gather(struct ps3_storage_device *dev, ...@@ -120,8 +120,7 @@ static void ps3disk_scatter_gather(struct ps3_storage_device *dev,
static int ps3disk_submit_request_sg(struct ps3_storage_device *dev, static int ps3disk_submit_request_sg(struct ps3_storage_device *dev,
struct request *req) struct request *req)
{ {
struct ps3disk_private *priv = struct ps3disk_private *priv = ps3_system_bus_get_drvdata(&dev->sbd);
ps3_system_bus_get_driver_data(&dev->sbd);
int write = rq_data_dir(req), res; int write = rq_data_dir(req), res;
const char *op = write ? "write" : "read"; const char *op = write ? "write" : "read";
u64 start_sector, sectors; u64 start_sector, sectors;
...@@ -169,8 +168,7 @@ static int ps3disk_submit_request_sg(struct ps3_storage_device *dev, ...@@ -169,8 +168,7 @@ static int ps3disk_submit_request_sg(struct ps3_storage_device *dev,
static int ps3disk_submit_flush_request(struct ps3_storage_device *dev, static int ps3disk_submit_flush_request(struct ps3_storage_device *dev,
struct request *req) struct request *req)
{ {
struct ps3disk_private *priv = struct ps3disk_private *priv = ps3_system_bus_get_drvdata(&dev->sbd);
ps3_system_bus_get_driver_data(&dev->sbd);
u64 res; u64 res;
dev_dbg(&dev->sbd.core, "%s:%u: flush request\n", __func__, __LINE__); dev_dbg(&dev->sbd.core, "%s:%u: flush request\n", __func__, __LINE__);
...@@ -215,8 +213,7 @@ static void ps3disk_do_request(struct ps3_storage_device *dev, ...@@ -215,8 +213,7 @@ static void ps3disk_do_request(struct ps3_storage_device *dev,
static void ps3disk_request(struct request_queue *q) static void ps3disk_request(struct request_queue *q)
{ {
struct ps3_storage_device *dev = q->queuedata; struct ps3_storage_device *dev = q->queuedata;
struct ps3disk_private *priv = struct ps3disk_private *priv = ps3_system_bus_get_drvdata(&dev->sbd);
ps3_system_bus_get_driver_data(&dev->sbd);
if (priv->req) { if (priv->req) {
dev_dbg(&dev->sbd.core, "%s:%u busy\n", __func__, __LINE__); dev_dbg(&dev->sbd.core, "%s:%u busy\n", __func__, __LINE__);
...@@ -248,7 +245,7 @@ static irqreturn_t ps3disk_interrupt(int irq, void *data) ...@@ -248,7 +245,7 @@ static irqreturn_t ps3disk_interrupt(int irq, void *data)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
priv = ps3_system_bus_get_driver_data(&dev->sbd); priv = ps3_system_bus_get_drvdata(&dev->sbd);
req = priv->req; req = priv->req;
if (!req) { if (!req) {
dev_dbg(&dev->sbd.core, dev_dbg(&dev->sbd.core,
...@@ -367,8 +364,7 @@ static void ata_id_c_string(const u16 *id, unsigned char *s, unsigned int ofs, ...@@ -367,8 +364,7 @@ static void ata_id_c_string(const u16 *id, unsigned char *s, unsigned int ofs,
static int ps3disk_identify(struct ps3_storage_device *dev) static int ps3disk_identify(struct ps3_storage_device *dev)
{ {
struct ps3disk_private *priv = struct ps3disk_private *priv = ps3_system_bus_get_drvdata(&dev->sbd);
ps3_system_bus_get_driver_data(&dev->sbd);
struct lv1_ata_cmnd_block ata_cmnd; struct lv1_ata_cmnd_block ata_cmnd;
u16 *id = dev->bounce_buf; u16 *id = dev->bounce_buf;
u64 res; u64 res;
...@@ -449,7 +445,7 @@ static int __devinit ps3disk_probe(struct ps3_system_bus_device *_dev) ...@@ -449,7 +445,7 @@ static int __devinit ps3disk_probe(struct ps3_system_bus_device *_dev)
goto fail; goto fail;
} }
ps3_system_bus_set_driver_data(_dev, priv); ps3_system_bus_set_drvdata(_dev, priv);
spin_lock_init(&priv->lock); spin_lock_init(&priv->lock);
dev->bounce_size = BOUNCE_SIZE; dev->bounce_size = BOUNCE_SIZE;
...@@ -527,7 +523,7 @@ static int __devinit ps3disk_probe(struct ps3_system_bus_device *_dev) ...@@ -527,7 +523,7 @@ static int __devinit ps3disk_probe(struct ps3_system_bus_device *_dev)
kfree(dev->bounce_buf); kfree(dev->bounce_buf);
fail_free_priv: fail_free_priv:
kfree(priv); kfree(priv);
ps3_system_bus_set_driver_data(_dev, NULL); ps3_system_bus_set_drvdata(_dev, NULL);
fail: fail:
mutex_lock(&ps3disk_mask_mutex); mutex_lock(&ps3disk_mask_mutex);
__clear_bit(devidx, &ps3disk_mask); __clear_bit(devidx, &ps3disk_mask);
...@@ -538,8 +534,7 @@ static int __devinit ps3disk_probe(struct ps3_system_bus_device *_dev) ...@@ -538,8 +534,7 @@ static int __devinit ps3disk_probe(struct ps3_system_bus_device *_dev)
static int ps3disk_remove(struct ps3_system_bus_device *_dev) static int ps3disk_remove(struct ps3_system_bus_device *_dev)
{ {
struct ps3_storage_device *dev = to_ps3_storage_device(&_dev->core); struct ps3_storage_device *dev = to_ps3_storage_device(&_dev->core);
struct ps3disk_private *priv = struct ps3disk_private *priv = ps3_system_bus_get_drvdata(&dev->sbd);
ps3_system_bus_get_driver_data(&dev->sbd);
mutex_lock(&ps3disk_mask_mutex); mutex_lock(&ps3disk_mask_mutex);
__clear_bit(MINOR(disk_devt(priv->gendisk)) / PS3DISK_MINORS, __clear_bit(MINOR(disk_devt(priv->gendisk)) / PS3DISK_MINORS,
...@@ -553,7 +548,7 @@ static int ps3disk_remove(struct ps3_system_bus_device *_dev) ...@@ -553,7 +548,7 @@ static int ps3disk_remove(struct ps3_system_bus_device *_dev)
ps3stor_teardown(dev); ps3stor_teardown(dev);
kfree(dev->bounce_buf); kfree(dev->bounce_buf);
kfree(priv); kfree(priv);
ps3_system_bus_set_driver_data(_dev, NULL); ps3_system_bus_set_drvdata(_dev, NULL);
return 0; return 0;
} }
......
...@@ -110,7 +110,7 @@ static u32 *ps3vram_get_notifier(void *reports, int notifier) ...@@ -110,7 +110,7 @@ static u32 *ps3vram_get_notifier(void *reports, int notifier)
static void ps3vram_notifier_reset(struct ps3_system_bus_device *dev) static void ps3vram_notifier_reset(struct ps3_system_bus_device *dev)
{ {
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev); struct ps3vram_priv *priv = ps3_system_bus_get_drvdata(dev);
u32 *notify = ps3vram_get_notifier(priv->reports, NOTIFIER); u32 *notify = ps3vram_get_notifier(priv->reports, NOTIFIER);
int i; int i;
...@@ -121,7 +121,7 @@ static void ps3vram_notifier_reset(struct ps3_system_bus_device *dev) ...@@ -121,7 +121,7 @@ static void ps3vram_notifier_reset(struct ps3_system_bus_device *dev)
static int ps3vram_notifier_wait(struct ps3_system_bus_device *dev, static int ps3vram_notifier_wait(struct ps3_system_bus_device *dev,
unsigned int timeout_ms) unsigned int timeout_ms)
{ {
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev); struct ps3vram_priv *priv = ps3_system_bus_get_drvdata(dev);
u32 *notify = ps3vram_get_notifier(priv->reports, NOTIFIER); u32 *notify = ps3vram_get_notifier(priv->reports, NOTIFIER);
unsigned long timeout = jiffies + msecs_to_jiffies(timeout_ms); unsigned long timeout = jiffies + msecs_to_jiffies(timeout_ms);
...@@ -136,7 +136,7 @@ static int ps3vram_notifier_wait(struct ps3_system_bus_device *dev, ...@@ -136,7 +136,7 @@ static int ps3vram_notifier_wait(struct ps3_system_bus_device *dev,
static void ps3vram_init_ring(struct ps3_system_bus_device *dev) static void ps3vram_init_ring(struct ps3_system_bus_device *dev)
{ {
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev); struct ps3vram_priv *priv = ps3_system_bus_get_drvdata(dev);
priv->ctrl[CTRL_PUT] = FIFO_BASE + FIFO_OFFSET; priv->ctrl[CTRL_PUT] = FIFO_BASE + FIFO_OFFSET;
priv->ctrl[CTRL_GET] = FIFO_BASE + FIFO_OFFSET; priv->ctrl[CTRL_GET] = FIFO_BASE + FIFO_OFFSET;
...@@ -145,7 +145,7 @@ static void ps3vram_init_ring(struct ps3_system_bus_device *dev) ...@@ -145,7 +145,7 @@ static void ps3vram_init_ring(struct ps3_system_bus_device *dev)
static int ps3vram_wait_ring(struct ps3_system_bus_device *dev, static int ps3vram_wait_ring(struct ps3_system_bus_device *dev,
unsigned int timeout_ms) unsigned int timeout_ms)
{ {
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev); struct ps3vram_priv *priv = ps3_system_bus_get_drvdata(dev);
unsigned long timeout = jiffies + msecs_to_jiffies(timeout_ms); unsigned long timeout = jiffies + msecs_to_jiffies(timeout_ms);
do { do {
...@@ -174,7 +174,7 @@ static void ps3vram_begin_ring(struct ps3vram_priv *priv, u32 chan, u32 tag, ...@@ -174,7 +174,7 @@ static void ps3vram_begin_ring(struct ps3vram_priv *priv, u32 chan, u32 tag,
static void ps3vram_rewind_ring(struct ps3_system_bus_device *dev) static void ps3vram_rewind_ring(struct ps3_system_bus_device *dev)
{ {
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev); struct ps3vram_priv *priv = ps3_system_bus_get_drvdata(dev);
int status; int status;
ps3vram_out_ring(priv, 0x20000000 | (FIFO_BASE + FIFO_OFFSET)); ps3vram_out_ring(priv, 0x20000000 | (FIFO_BASE + FIFO_OFFSET));
...@@ -192,7 +192,7 @@ static void ps3vram_rewind_ring(struct ps3_system_bus_device *dev) ...@@ -192,7 +192,7 @@ static void ps3vram_rewind_ring(struct ps3_system_bus_device *dev)
static void ps3vram_fire_ring(struct ps3_system_bus_device *dev) static void ps3vram_fire_ring(struct ps3_system_bus_device *dev)
{ {
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev); struct ps3vram_priv *priv = ps3_system_bus_get_drvdata(dev);
int status; int status;
mutex_lock(&ps3_gpu_mutex); mutex_lock(&ps3_gpu_mutex);
...@@ -218,7 +218,7 @@ static void ps3vram_fire_ring(struct ps3_system_bus_device *dev) ...@@ -218,7 +218,7 @@ static void ps3vram_fire_ring(struct ps3_system_bus_device *dev)
static void ps3vram_bind(struct ps3_system_bus_device *dev) static void ps3vram_bind(struct ps3_system_bus_device *dev)
{ {
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev); struct ps3vram_priv *priv = ps3_system_bus_get_drvdata(dev);
ps3vram_begin_ring(priv, UPLOAD_SUBCH, 0, 1); ps3vram_begin_ring(priv, UPLOAD_SUBCH, 0, 1);
ps3vram_out_ring(priv, 0x31337303); ps3vram_out_ring(priv, 0x31337303);
...@@ -241,7 +241,7 @@ static int ps3vram_upload(struct ps3_system_bus_device *dev, ...@@ -241,7 +241,7 @@ static int ps3vram_upload(struct ps3_system_bus_device *dev,
unsigned int src_offset, unsigned int dst_offset, unsigned int src_offset, unsigned int dst_offset,
int len, int count) int len, int count)
{ {
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev); struct ps3vram_priv *priv = ps3_system_bus_get_drvdata(dev);
ps3vram_begin_ring(priv, UPLOAD_SUBCH, ps3vram_begin_ring(priv, UPLOAD_SUBCH,
NV_MEMORY_TO_MEMORY_FORMAT_OFFSET_IN, 8); NV_MEMORY_TO_MEMORY_FORMAT_OFFSET_IN, 8);
...@@ -273,7 +273,7 @@ static int ps3vram_download(struct ps3_system_bus_device *dev, ...@@ -273,7 +273,7 @@ static int ps3vram_download(struct ps3_system_bus_device *dev,
unsigned int src_offset, unsigned int dst_offset, unsigned int src_offset, unsigned int dst_offset,
int len, int count) int len, int count)
{ {
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev); struct ps3vram_priv *priv = ps3_system_bus_get_drvdata(dev);
ps3vram_begin_ring(priv, DOWNLOAD_SUBCH, ps3vram_begin_ring(priv, DOWNLOAD_SUBCH,
NV_MEMORY_TO_MEMORY_FORMAT_OFFSET_IN, 8); NV_MEMORY_TO_MEMORY_FORMAT_OFFSET_IN, 8);
...@@ -303,7 +303,7 @@ static int ps3vram_download(struct ps3_system_bus_device *dev, ...@@ -303,7 +303,7 @@ static int ps3vram_download(struct ps3_system_bus_device *dev,
static void ps3vram_cache_evict(struct ps3_system_bus_device *dev, int entry) static void ps3vram_cache_evict(struct ps3_system_bus_device *dev, int entry)
{ {
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev); struct ps3vram_priv *priv = ps3_system_bus_get_drvdata(dev);
struct ps3vram_cache *cache = &priv->cache; struct ps3vram_cache *cache = &priv->cache;
if (!(cache->tags[entry].flags & CACHE_PAGE_DIRTY)) if (!(cache->tags[entry].flags & CACHE_PAGE_DIRTY))
...@@ -325,7 +325,7 @@ static void ps3vram_cache_evict(struct ps3_system_bus_device *dev, int entry) ...@@ -325,7 +325,7 @@ static void ps3vram_cache_evict(struct ps3_system_bus_device *dev, int entry)
static void ps3vram_cache_load(struct ps3_system_bus_device *dev, int entry, static void ps3vram_cache_load(struct ps3_system_bus_device *dev, int entry,
unsigned int address) unsigned int address)
{ {
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev); struct ps3vram_priv *priv = ps3_system_bus_get_drvdata(dev);
struct ps3vram_cache *cache = &priv->cache; struct ps3vram_cache *cache = &priv->cache;
dev_dbg(&dev->core, "Fetching %d: 0x%08x\n", entry, address); dev_dbg(&dev->core, "Fetching %d: 0x%08x\n", entry, address);
...@@ -345,7 +345,7 @@ static void ps3vram_cache_load(struct ps3_system_bus_device *dev, int entry, ...@@ -345,7 +345,7 @@ static void ps3vram_cache_load(struct ps3_system_bus_device *dev, int entry,
static void ps3vram_cache_flush(struct ps3_system_bus_device *dev) static void ps3vram_cache_flush(struct ps3_system_bus_device *dev)
{ {
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev); struct ps3vram_priv *priv = ps3_system_bus_get_drvdata(dev);
struct ps3vram_cache *cache = &priv->cache; struct ps3vram_cache *cache = &priv->cache;
int i; int i;
...@@ -359,7 +359,7 @@ static void ps3vram_cache_flush(struct ps3_system_bus_device *dev) ...@@ -359,7 +359,7 @@ static void ps3vram_cache_flush(struct ps3_system_bus_device *dev)
static unsigned int ps3vram_cache_match(struct ps3_system_bus_device *dev, static unsigned int ps3vram_cache_match(struct ps3_system_bus_device *dev,
loff_t address) loff_t address)
{ {
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev); struct ps3vram_priv *priv = ps3_system_bus_get_drvdata(dev);
struct ps3vram_cache *cache = &priv->cache; struct ps3vram_cache *cache = &priv->cache;
unsigned int base; unsigned int base;
unsigned int offset; unsigned int offset;
...@@ -393,7 +393,7 @@ static unsigned int ps3vram_cache_match(struct ps3_system_bus_device *dev, ...@@ -393,7 +393,7 @@ static unsigned int ps3vram_cache_match(struct ps3_system_bus_device *dev,
static int ps3vram_cache_init(struct ps3_system_bus_device *dev) static int ps3vram_cache_init(struct ps3_system_bus_device *dev)
{ {
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev); struct ps3vram_priv *priv = ps3_system_bus_get_drvdata(dev);
priv->cache.page_count = CACHE_PAGE_COUNT; priv->cache.page_count = CACHE_PAGE_COUNT;
priv->cache.page_size = CACHE_PAGE_SIZE; priv->cache.page_size = CACHE_PAGE_SIZE;
...@@ -412,7 +412,7 @@ static int ps3vram_cache_init(struct ps3_system_bus_device *dev) ...@@ -412,7 +412,7 @@ static int ps3vram_cache_init(struct ps3_system_bus_device *dev)
static void ps3vram_cache_cleanup(struct ps3_system_bus_device *dev) static void ps3vram_cache_cleanup(struct ps3_system_bus_device *dev)
{ {
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev); struct ps3vram_priv *priv = ps3_system_bus_get_drvdata(dev);
ps3vram_cache_flush(dev); ps3vram_cache_flush(dev);
kfree(priv->cache.tags); kfree(priv->cache.tags);
...@@ -421,7 +421,7 @@ static void ps3vram_cache_cleanup(struct ps3_system_bus_device *dev) ...@@ -421,7 +421,7 @@ static void ps3vram_cache_cleanup(struct ps3_system_bus_device *dev)
static int ps3vram_read(struct ps3_system_bus_device *dev, loff_t from, static int ps3vram_read(struct ps3_system_bus_device *dev, loff_t from,
size_t len, size_t *retlen, u_char *buf) size_t len, size_t *retlen, u_char *buf)
{ {
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev); struct ps3vram_priv *priv = ps3_system_bus_get_drvdata(dev);
unsigned int cached, count; unsigned int cached, count;
dev_dbg(&dev->core, "%s: from=0x%08x len=0x%zx\n", __func__, dev_dbg(&dev->core, "%s: from=0x%08x len=0x%zx\n", __func__,
...@@ -465,7 +465,7 @@ static int ps3vram_read(struct ps3_system_bus_device *dev, loff_t from, ...@@ -465,7 +465,7 @@ static int ps3vram_read(struct ps3_system_bus_device *dev, loff_t from,
static int ps3vram_write(struct ps3_system_bus_device *dev, loff_t to, static int ps3vram_write(struct ps3_system_bus_device *dev, loff_t to,
size_t len, size_t *retlen, const u_char *buf) size_t len, size_t *retlen, const u_char *buf)
{ {
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev); struct ps3vram_priv *priv = ps3_system_bus_get_drvdata(dev);
unsigned int cached, count; unsigned int cached, count;
if (to >= priv->size) if (to >= priv->size)
...@@ -528,7 +528,7 @@ static const struct file_operations ps3vram_proc_fops = { ...@@ -528,7 +528,7 @@ static const struct file_operations ps3vram_proc_fops = {
static void __devinit ps3vram_proc_init(struct ps3_system_bus_device *dev) static void __devinit ps3vram_proc_init(struct ps3_system_bus_device *dev)
{ {
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev); struct ps3vram_priv *priv = ps3_system_bus_get_drvdata(dev);
struct proc_dir_entry *pde; struct proc_dir_entry *pde;
pde = proc_create_data(DEVICE_NAME, 0444, NULL, &ps3vram_proc_fops, pde = proc_create_data(DEVICE_NAME, 0444, NULL, &ps3vram_proc_fops,
...@@ -540,7 +540,7 @@ static void __devinit ps3vram_proc_init(struct ps3_system_bus_device *dev) ...@@ -540,7 +540,7 @@ static void __devinit ps3vram_proc_init(struct ps3_system_bus_device *dev)
static struct bio *ps3vram_do_bio(struct ps3_system_bus_device *dev, static struct bio *ps3vram_do_bio(struct ps3_system_bus_device *dev,
struct bio *bio) struct bio *bio)
{ {
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev); struct ps3vram_priv *priv = ps3_system_bus_get_drvdata(dev);
int write = bio_data_dir(bio) == WRITE; int write = bio_data_dir(bio) == WRITE;
const char *op = write ? "write" : "read"; const char *op = write ? "write" : "read";
loff_t offset = bio->bi_sector << 9; loff_t offset = bio->bi_sector << 9;
...@@ -590,7 +590,7 @@ static struct bio *ps3vram_do_bio(struct ps3_system_bus_device *dev, ...@@ -590,7 +590,7 @@ static struct bio *ps3vram_do_bio(struct ps3_system_bus_device *dev,
static int ps3vram_make_request(struct request_queue *q, struct bio *bio) static int ps3vram_make_request(struct request_queue *q, struct bio *bio)
{ {
struct ps3_system_bus_device *dev = q->queuedata; struct ps3_system_bus_device *dev = q->queuedata;
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev); struct ps3vram_priv *priv = ps3_system_bus_get_drvdata(dev);
int busy; int busy;
dev_dbg(&dev->core, "%s\n", __func__); dev_dbg(&dev->core, "%s\n", __func__);
...@@ -628,7 +628,7 @@ static int __devinit ps3vram_probe(struct ps3_system_bus_device *dev) ...@@ -628,7 +628,7 @@ static int __devinit ps3vram_probe(struct ps3_system_bus_device *dev)
spin_lock_init(&priv->lock); spin_lock_init(&priv->lock);
bio_list_init(&priv->list); bio_list_init(&priv->list);
ps3_system_bus_set_driver_data(dev, priv); ps3_system_bus_set_drvdata(dev, priv);
/* Allocate XDR buffer (1MiB aligned) */ /* Allocate XDR buffer (1MiB aligned) */
priv->xdr_buf = (void *)__get_free_pages(GFP_KERNEL, priv->xdr_buf = (void *)__get_free_pages(GFP_KERNEL,
...@@ -793,14 +793,14 @@ static int __devinit ps3vram_probe(struct ps3_system_bus_device *dev) ...@@ -793,14 +793,14 @@ static int __devinit ps3vram_probe(struct ps3_system_bus_device *dev)
free_pages((unsigned long) priv->xdr_buf, get_order(XDR_BUF_SIZE)); free_pages((unsigned long) priv->xdr_buf, get_order(XDR_BUF_SIZE));
fail_free_priv: fail_free_priv:
kfree(priv); kfree(priv);
ps3_system_bus_set_driver_data(dev, NULL); ps3_system_bus_set_drvdata(dev, NULL);
fail: fail:
return error; return error;
} }
static int ps3vram_remove(struct ps3_system_bus_device *dev) static int ps3vram_remove(struct ps3_system_bus_device *dev)
{ {
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev); struct ps3vram_priv *priv = ps3_system_bus_get_drvdata(dev);
del_gendisk(priv->gendisk); del_gendisk(priv->gendisk);
put_disk(priv->gendisk); put_disk(priv->gendisk);
...@@ -817,7 +817,7 @@ static int ps3vram_remove(struct ps3_system_bus_device *dev) ...@@ -817,7 +817,7 @@ static int ps3vram_remove(struct ps3_system_bus_device *dev)
ps3_close_hv_device(dev); ps3_close_hv_device(dev);
free_pages((unsigned long) priv->xdr_buf, get_order(XDR_BUF_SIZE)); free_pages((unsigned long) priv->xdr_buf, get_order(XDR_BUF_SIZE));
kfree(priv); kfree(priv);
ps3_system_bus_set_driver_data(dev, NULL); ps3_system_bus_set_drvdata(dev, NULL);
return 0; return 0;
} }
......
...@@ -1648,7 +1648,7 @@ static int ps3_gelic_driver_probe(struct ps3_system_bus_device *dev) ...@@ -1648,7 +1648,7 @@ static int ps3_gelic_driver_probe(struct ps3_system_bus_device *dev)
result = -ENOMEM; result = -ENOMEM;
goto fail_alloc_card; goto fail_alloc_card;
} }
ps3_system_bus_set_driver_data(dev, card); ps3_system_bus_set_drvdata(dev, card);
card->dev = dev; card->dev = dev;
/* get internal vlan info */ /* get internal vlan info */
...@@ -1749,7 +1749,7 @@ static int ps3_gelic_driver_probe(struct ps3_system_bus_device *dev) ...@@ -1749,7 +1749,7 @@ static int ps3_gelic_driver_probe(struct ps3_system_bus_device *dev)
bus_id(card), bus_id(card),
0, 0); 0, 0);
fail_status_indicator: fail_status_indicator:
ps3_system_bus_set_driver_data(dev, NULL); ps3_system_bus_set_drvdata(dev, NULL);
kfree(netdev_card(netdev)->unalign); kfree(netdev_card(netdev)->unalign);
free_netdev(netdev); free_netdev(netdev);
fail_alloc_card: fail_alloc_card:
...@@ -1766,7 +1766,7 @@ static int ps3_gelic_driver_probe(struct ps3_system_bus_device *dev) ...@@ -1766,7 +1766,7 @@ static int ps3_gelic_driver_probe(struct ps3_system_bus_device *dev)
static int ps3_gelic_driver_remove(struct ps3_system_bus_device *dev) static int ps3_gelic_driver_remove(struct ps3_system_bus_device *dev)
{ {
struct gelic_card *card = ps3_system_bus_get_driver_data(dev); struct gelic_card *card = ps3_system_bus_get_drvdata(dev);
struct net_device *netdev0; struct net_device *netdev0;
pr_debug("%s: called\n", __func__); pr_debug("%s: called\n", __func__);
...@@ -1803,7 +1803,7 @@ static int ps3_gelic_driver_remove(struct ps3_system_bus_device *dev) ...@@ -1803,7 +1803,7 @@ static int ps3_gelic_driver_remove(struct ps3_system_bus_device *dev)
kfree(netdev_card(netdev0)->unalign); kfree(netdev_card(netdev0)->unalign);
free_netdev(netdev0); free_netdev(netdev0);
ps3_system_bus_set_driver_data(dev, NULL); ps3_system_bus_set_drvdata(dev, NULL);
ps3_dma_region_free(dev->d_region); ps3_dma_region_free(dev->d_region);
......
...@@ -162,7 +162,7 @@ static int ps3_ehci_probe(struct ps3_system_bus_device *dev) ...@@ -162,7 +162,7 @@ static int ps3_ehci_probe(struct ps3_system_bus_device *dev)
dev_dbg(&dev->core, "%s:%d: virq %lu\n", __func__, __LINE__, dev_dbg(&dev->core, "%s:%d: virq %lu\n", __func__, __LINE__,
(unsigned long)virq); (unsigned long)virq);
ps3_system_bus_set_driver_data(dev, hcd); ps3_system_bus_set_drvdata(dev, hcd);
result = usb_add_hcd(hcd, virq, IRQF_DISABLED); result = usb_add_hcd(hcd, virq, IRQF_DISABLED);
...@@ -195,8 +195,7 @@ static int ps3_ehci_probe(struct ps3_system_bus_device *dev) ...@@ -195,8 +195,7 @@ static int ps3_ehci_probe(struct ps3_system_bus_device *dev)
static int ps3_ehci_remove(struct ps3_system_bus_device *dev) static int ps3_ehci_remove(struct ps3_system_bus_device *dev)
{ {
unsigned int tmp; unsigned int tmp;
struct usb_hcd *hcd = struct usb_hcd *hcd = ps3_system_bus_get_drvdata(dev);
(struct usb_hcd *)ps3_system_bus_get_driver_data(dev);
BUG_ON(!hcd); BUG_ON(!hcd);
...@@ -208,7 +207,7 @@ static int ps3_ehci_remove(struct ps3_system_bus_device *dev) ...@@ -208,7 +207,7 @@ static int ps3_ehci_remove(struct ps3_system_bus_device *dev)
ehci_shutdown(hcd); ehci_shutdown(hcd);
usb_remove_hcd(hcd); usb_remove_hcd(hcd);
ps3_system_bus_set_driver_data(dev, NULL); ps3_system_bus_set_drvdata(dev, NULL);
BUG_ON(!hcd->regs); BUG_ON(!hcd->regs);
iounmap(hcd->regs); iounmap(hcd->regs);
......
...@@ -162,7 +162,7 @@ static int ps3_ohci_probe(struct ps3_system_bus_device *dev) ...@@ -162,7 +162,7 @@ static int ps3_ohci_probe(struct ps3_system_bus_device *dev)
dev_dbg(&dev->core, "%s:%d: virq %lu\n", __func__, __LINE__, dev_dbg(&dev->core, "%s:%d: virq %lu\n", __func__, __LINE__,
(unsigned long)virq); (unsigned long)virq);
ps3_system_bus_set_driver_data(dev, hcd); ps3_system_bus_set_drvdata(dev, hcd);
result = usb_add_hcd(hcd, virq, IRQF_DISABLED); result = usb_add_hcd(hcd, virq, IRQF_DISABLED);
...@@ -195,8 +195,7 @@ static int ps3_ohci_probe(struct ps3_system_bus_device *dev) ...@@ -195,8 +195,7 @@ static int ps3_ohci_probe(struct ps3_system_bus_device *dev)
static int ps3_ohci_remove(struct ps3_system_bus_device *dev) static int ps3_ohci_remove(struct ps3_system_bus_device *dev)
{ {
unsigned int tmp; unsigned int tmp;
struct usb_hcd *hcd = struct usb_hcd *hcd = ps3_system_bus_get_drvdata(dev);
(struct usb_hcd *)ps3_system_bus_get_driver_data(dev);
BUG_ON(!hcd); BUG_ON(!hcd);
...@@ -208,7 +207,7 @@ static int ps3_ohci_remove(struct ps3_system_bus_device *dev) ...@@ -208,7 +207,7 @@ static int ps3_ohci_remove(struct ps3_system_bus_device *dev)
ohci_shutdown(hcd); ohci_shutdown(hcd);
usb_remove_hcd(hcd); usb_remove_hcd(hcd);
ps3_system_bus_set_driver_data(dev, NULL); ps3_system_bus_set_drvdata(dev, NULL);
BUG_ON(!hcd->regs); BUG_ON(!hcd->regs);
iounmap(hcd->regs); iounmap(hcd->regs);
......
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