Skip to content

Commit

Permalink
block/ps3: remove driver_data direct access of struct device
Browse files Browse the repository at this point in the history 
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 <[email protected]>
Signed-off-by: Geert Uytterhoeven <[email protected]>
Cc: Jim Paris <[email protected]>
Cc: Jens Axboe <[email protected]>
Signed-off-by: Benjamin Herrenschmidt <[email protected]>
  • Loading branch information
@RoelKluin @ozbenh
RoelKluin authored and ozbenh committed Jun 15, 2009
1 parent 1bd9784 commit 6dee2c8
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 35 deletions.
23 changes: 14 additions & 9 deletions drivers/block/ps3disk.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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__);
Expand Down Expand Up @@ -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__);
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -523,7 +527,7 @@ static int __devinit ps3disk_probe(struct ps3_system_bus_device *_dev)
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);
Expand All @@ -534,7 +538,8 @@ static int __devinit ps3disk_probe(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 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,
Expand All @@ -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;
}

Expand Down
50 changes: 24 additions & 26 deletions drivers/block/ps3vram.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ static u32 *ps3vram_get_notifier(void *reports, int notifier)

static void ps3vram_notifier_reset(struct ps3_system_bus_device *dev)
{
struct ps3vram_priv *priv = dev->core.driver_data;
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);
u32 *notify = ps3vram_get_notifier(priv->reports, NOTIFIER);
int i;

Expand All @@ -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,
unsigned int timeout_ms)
{
struct ps3vram_priv *priv = dev->core.driver_data;
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);
u32 *notify = ps3vram_get_notifier(priv->reports, NOTIFIER);
unsigned long timeout = jiffies + msecs_to_jiffies(timeout_ms);

Expand All @@ -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)
{
struct ps3vram_priv *priv = dev->core.driver_data;
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);

priv->ctrl[CTRL_PUT] = FIFO_BASE + FIFO_OFFSET;
priv->ctrl[CTRL_GET] = FIFO_BASE + FIFO_OFFSET;
Expand All @@ -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,
unsigned int timeout_ms)
{
struct ps3vram_priv *priv = dev->core.driver_data;
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);
unsigned long timeout = jiffies + msecs_to_jiffies(timeout_ms);

do {
Expand Down Expand Up @@ -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)
{
struct ps3vram_priv *priv = dev->core.driver_data;
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);
int status;

ps3vram_out_ring(priv, 0x20000000 | (FIFO_BASE + FIFO_OFFSET));
Expand All @@ -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)
{
struct ps3vram_priv *priv = dev->core.driver_data;
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);
int status;

mutex_lock(&ps3_gpu_mutex);
Expand All @@ -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)
{
struct ps3vram_priv *priv = dev->core.driver_data;
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);

ps3vram_begin_ring(priv, UPLOAD_SUBCH, 0, 1);
ps3vram_out_ring(priv, 0x31337303);
Expand All @@ -241,7 +241,7 @@ static int ps3vram_upload(struct ps3_system_bus_device *dev,
unsigned int src_offset, unsigned int dst_offset,
int len, int count)
{
struct ps3vram_priv *priv = dev->core.driver_data;
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);

ps3vram_begin_ring(priv, UPLOAD_SUBCH,
NV_MEMORY_TO_MEMORY_FORMAT_OFFSET_IN, 8);
Expand Down Expand Up @@ -273,7 +273,7 @@ static int ps3vram_download(struct ps3_system_bus_device *dev,
unsigned int src_offset, unsigned int dst_offset,
int len, int count)
{
struct ps3vram_priv *priv = dev->core.driver_data;
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);

ps3vram_begin_ring(priv, DOWNLOAD_SUBCH,
NV_MEMORY_TO_MEMORY_FORMAT_OFFSET_IN, 8);
Expand Down Expand Up @@ -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)
{
struct ps3vram_priv *priv = dev->core.driver_data;
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);
struct ps3vram_cache *cache = &priv->cache;

if (!(cache->tags[entry].flags & CACHE_PAGE_DIRTY))
Expand All @@ -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,
unsigned int address)
{
struct ps3vram_priv *priv = dev->core.driver_data;
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);
struct ps3vram_cache *cache = &priv->cache;

dev_dbg(&dev->core, "Fetching %d: 0x%08x\n", entry, address);
Expand All @@ -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)
{
struct ps3vram_priv *priv = dev->core.driver_data;
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);
struct ps3vram_cache *cache = &priv->cache;
int i;

Expand All @@ -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,
loff_t address)
{
struct ps3vram_priv *priv = dev->core.driver_data;
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);
struct ps3vram_cache *cache = &priv->cache;
unsigned int base;
unsigned int offset;
Expand Down Expand Up @@ -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)
{
struct ps3vram_priv *priv = dev->core.driver_data;
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);

priv->cache.page_count = CACHE_PAGE_COUNT;
priv->cache.page_size = CACHE_PAGE_SIZE;
Expand All @@ -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)
{
struct ps3vram_priv *priv = dev->core.driver_data;
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);

ps3vram_cache_flush(dev);
kfree(priv->cache.tags);
Expand All @@ -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,
size_t len, size_t *retlen, u_char *buf)
{
struct ps3vram_priv *priv = dev->core.driver_data;
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);
unsigned int cached, count;

dev_dbg(&dev->core, "%s: from=0x%08x len=0x%zx\n", __func__,
Expand Down Expand Up @@ -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,
size_t len, size_t *retlen, const u_char *buf)
{
struct ps3vram_priv *priv = dev->core.driver_data;
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);
unsigned int cached, count;

if (to >= priv->size)
Expand Down Expand Up @@ -528,7 +528,7 @@ static const struct file_operations ps3vram_proc_fops = {

static void __devinit ps3vram_proc_init(struct ps3_system_bus_device *dev)
{
struct ps3vram_priv *priv = dev->core.driver_data;
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);
struct proc_dir_entry *pde;

pde = proc_create_data(DEVICE_NAME, 0444, NULL, &ps3vram_proc_fops,
Expand All @@ -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,
struct bio *bio)
{
struct ps3vram_priv *priv = dev->core.driver_data;
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);
int write = bio_data_dir(bio) == WRITE;
const char *op = write ? "write" : "read";
loff_t offset = bio->bi_sector << 9;
Expand Down Expand Up @@ -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)
{
struct ps3_system_bus_device *dev = q->queuedata;
struct ps3vram_priv *priv = dev->core.driver_data;
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);
int busy;

dev_dbg(&dev->core, "%s\n", __func__);
Expand Down Expand Up @@ -628,9 +628,7 @@ static int __devinit ps3vram_probe(struct ps3_system_bus_device *dev)

spin_lock_init(&priv->lock);
bio_list_init(&priv->list);
dev->core.driver_data = priv;

priv = dev->core.driver_data;
ps3_system_bus_set_driver_data(dev, priv);

/* Allocate XDR buffer (1MiB aligned) */
priv->xdr_buf = (void *)__get_free_pages(GFP_KERNEL,
Expand Down Expand Up @@ -795,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));
fail_free_priv:
kfree(priv);
dev->core.driver_data = NULL;
ps3_system_bus_set_driver_data(dev, NULL);
fail:
return error;
}

static int ps3vram_remove(struct ps3_system_bus_device *dev)
{
struct ps3vram_priv *priv = dev->core.driver_data;
struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);

del_gendisk(priv->gendisk);
put_disk(priv->gendisk);
Expand All @@ -819,7 +817,7 @@ static int ps3vram_remove(struct ps3_system_bus_device *dev)
ps3_close_hv_device(dev);
free_pages((unsigned long) priv->xdr_buf, get_order(XDR_BUF_SIZE));
kfree(priv);
dev->core.driver_data = NULL;
ps3_system_bus_set_driver_data(dev, NULL);
return 0;
}

Expand Down

0 comments on commit 6dee2c8

Please sign in to comment.