Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6dee2c87ebbe5d7ce8c4c163966a0bd9c02c75ef

Authored by Roel Kluin
Committed by Benjamin Herrenschmidt
1 parent 1bd9784f5e

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>

Showing 2 changed files with 38 additions and 35 deletions Side-by-side Diff

drivers/block/ps3disk.c
Diff comments   View file @ 6dee2c8
... ... @@ -120,7 +120,8 @@
120 120 static int ps3disk_submit_request_sg(struct ps3_storage_device *dev,
121 121 struct request *req)
122 122 {
123   - struct ps3disk_private *priv = dev->sbd.core.driver_data;
  123 + struct ps3disk_private *priv =
  124 + ps3_system_bus_get_driver_data(&dev->sbd);
124 125 int write = rq_data_dir(req), res;
125 126 const char *op = write ? "write" : "read";
126 127 u64 start_sector, sectors;
... ... @@ -168,7 +169,8 @@
168 169 static int ps3disk_submit_flush_request(struct ps3_storage_device *dev,
169 170 struct request *req)
170 171 {
171   - struct ps3disk_private *priv = dev->sbd.core.driver_data;
  172 + struct ps3disk_private *priv =
  173 + ps3_system_bus_get_driver_data(&dev->sbd);
172 174 u64 res;
173 175  
174 176 dev_dbg(&dev->sbd.core, "%s:%u: flush request\n", __func__, __LINE__);
... ... @@ -213,7 +215,8 @@
213 215 static void ps3disk_request(struct request_queue *q)
214 216 {
215 217 struct ps3_storage_device *dev = q->queuedata;
216   - struct ps3disk_private *priv = dev->sbd.core.driver_data;
  218 + struct ps3disk_private *priv =
  219 + ps3_system_bus_get_driver_data(&dev->sbd);
217 220  
218 221 if (priv->req) {
219 222 dev_dbg(&dev->sbd.core, "%s:%u busy\n", __func__, __LINE__);
... ... @@ -245,7 +248,7 @@
245 248 return IRQ_HANDLED;
246 249 }
247 250  
248   - priv = dev->sbd.core.driver_data;
  251 + priv = ps3_system_bus_get_driver_data(&dev->sbd);
249 252 req = priv->req;
250 253 if (!req) {
251 254 dev_dbg(&dev->sbd.core,
... ... @@ -364,7 +367,8 @@
364 367  
365 368 static int ps3disk_identify(struct ps3_storage_device *dev)
366 369 {
367   - struct ps3disk_private *priv = dev->sbd.core.driver_data;
  370 + struct ps3disk_private *priv =
  371 + ps3_system_bus_get_driver_data(&dev->sbd);
368 372 struct lv1_ata_cmnd_block ata_cmnd;
369 373 u16 *id = dev->bounce_buf;
370 374 u64 res;
... ... @@ -445,7 +449,7 @@
445 449 goto fail;
446 450 }
447 451  
448   - dev->sbd.core.driver_data = priv;
  452 + ps3_system_bus_set_driver_data(_dev, priv);
449 453 spin_lock_init(&priv->lock);
450 454  
451 455 dev->bounce_size = BOUNCE_SIZE;
... ... @@ -523,7 +527,7 @@
523 527 kfree(dev->bounce_buf);
524 528 fail_free_priv:
525 529 kfree(priv);
526   - dev->sbd.core.driver_data = NULL;
  530 + ps3_system_bus_set_driver_data(_dev, NULL);
527 531 fail:
528 532 mutex_lock(&ps3disk_mask_mutex);
529 533 __clear_bit(devidx, &ps3disk_mask);
... ... @@ -534,7 +538,8 @@
534 538 static int ps3disk_remove(struct ps3_system_bus_device *_dev)
535 539 {
536 540 struct ps3_storage_device *dev = to_ps3_storage_device(&_dev->core);
537   - struct ps3disk_private *priv = dev->sbd.core.driver_data;
  541 + struct ps3disk_private *priv =
  542 + ps3_system_bus_get_driver_data(&dev->sbd);
538 543  
539 544 mutex_lock(&ps3disk_mask_mutex);
540 545 __clear_bit(MINOR(disk_devt(priv->gendisk)) / PS3DISK_MINORS,
... ... @@ -548,7 +553,7 @@
548 553 ps3stor_teardown(dev);
549 554 kfree(dev->bounce_buf);
550 555 kfree(priv);
551   - dev->sbd.core.driver_data = NULL;
  556 + ps3_system_bus_set_driver_data(_dev, NULL);
552 557 return 0;
553 558 }
554 559  
drivers/block/ps3vram.c
Diff comments   View file @ 6dee2c8
... ... @@ -110,7 +110,7 @@
110 110  
111 111 static void ps3vram_notifier_reset(struct ps3_system_bus_device *dev)
112 112 {
113   - struct ps3vram_priv *priv = dev->core.driver_data;
  113 + struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);
114 114 u32 *notify = ps3vram_get_notifier(priv->reports, NOTIFIER);
115 115 int i;
116 116  
... ... @@ -121,7 +121,7 @@
121 121 static int ps3vram_notifier_wait(struct ps3_system_bus_device *dev,
122 122 unsigned int timeout_ms)
123 123 {
124   - struct ps3vram_priv *priv = dev->core.driver_data;
  124 + struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);
125 125 u32 *notify = ps3vram_get_notifier(priv->reports, NOTIFIER);
126 126 unsigned long timeout = jiffies + msecs_to_jiffies(timeout_ms);
127 127  
... ... @@ -136,7 +136,7 @@
136 136  
137 137 static void ps3vram_init_ring(struct ps3_system_bus_device *dev)
138 138 {
139   - struct ps3vram_priv *priv = dev->core.driver_data;
  139 + struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);
140 140  
141 141 priv->ctrl[CTRL_PUT] = FIFO_BASE + FIFO_OFFSET;
142 142 priv->ctrl[CTRL_GET] = FIFO_BASE + FIFO_OFFSET;
... ... @@ -145,7 +145,7 @@
145 145 static int ps3vram_wait_ring(struct ps3_system_bus_device *dev,
146 146 unsigned int timeout_ms)
147 147 {
148   - struct ps3vram_priv *priv = dev->core.driver_data;
  148 + struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);
149 149 unsigned long timeout = jiffies + msecs_to_jiffies(timeout_ms);
150 150  
151 151 do {
... ... @@ -174,7 +174,7 @@
174 174  
175 175 static void ps3vram_rewind_ring(struct ps3_system_bus_device *dev)
176 176 {
177   - struct ps3vram_priv *priv = dev->core.driver_data;
  177 + struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);
178 178 int status;
179 179  
180 180 ps3vram_out_ring(priv, 0x20000000 | (FIFO_BASE + FIFO_OFFSET));
... ... @@ -192,7 +192,7 @@
192 192  
193 193 static void ps3vram_fire_ring(struct ps3_system_bus_device *dev)
194 194 {
195   - struct ps3vram_priv *priv = dev->core.driver_data;
  195 + struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);
196 196 int status;
197 197  
198 198 mutex_lock(&ps3_gpu_mutex);
... ... @@ -218,7 +218,7 @@
218 218  
219 219 static void ps3vram_bind(struct ps3_system_bus_device *dev)
220 220 {
221   - struct ps3vram_priv *priv = dev->core.driver_data;
  221 + struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);
222 222  
223 223 ps3vram_begin_ring(priv, UPLOAD_SUBCH, 0, 1);
224 224 ps3vram_out_ring(priv, 0x31337303);
... ... @@ -241,7 +241,7 @@
241 241 unsigned int src_offset, unsigned int dst_offset,
242 242 int len, int count)
243 243 {
244   - struct ps3vram_priv *priv = dev->core.driver_data;
  244 + struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);
245 245  
246 246 ps3vram_begin_ring(priv, UPLOAD_SUBCH,
247 247 NV_MEMORY_TO_MEMORY_FORMAT_OFFSET_IN, 8);
... ... @@ -273,7 +273,7 @@
273 273 unsigned int src_offset, unsigned int dst_offset,
274 274 int len, int count)
275 275 {
276   - struct ps3vram_priv *priv = dev->core.driver_data;
  276 + struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);
277 277  
278 278 ps3vram_begin_ring(priv, DOWNLOAD_SUBCH,
279 279 NV_MEMORY_TO_MEMORY_FORMAT_OFFSET_IN, 8);
... ... @@ -303,7 +303,7 @@
303 303  
304 304 static void ps3vram_cache_evict(struct ps3_system_bus_device *dev, int entry)
305 305 {
306   - struct ps3vram_priv *priv = dev->core.driver_data;
  306 + struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);
307 307 struct ps3vram_cache *cache = &priv->cache;
308 308  
309 309 if (!(cache->tags[entry].flags & CACHE_PAGE_DIRTY))
... ... @@ -325,7 +325,7 @@
325 325 static void ps3vram_cache_load(struct ps3_system_bus_device *dev, int entry,
326 326 unsigned int address)
327 327 {
328   - struct ps3vram_priv *priv = dev->core.driver_data;
  328 + struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);
329 329 struct ps3vram_cache *cache = &priv->cache;
330 330  
331 331 dev_dbg(&dev->core, "Fetching %d: 0x%08x\n", entry, address);
... ... @@ -345,7 +345,7 @@
345 345  
346 346 static void ps3vram_cache_flush(struct ps3_system_bus_device *dev)
347 347 {
348   - struct ps3vram_priv *priv = dev->core.driver_data;
  348 + struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);
349 349 struct ps3vram_cache *cache = &priv->cache;
350 350 int i;
351 351  
... ... @@ -359,7 +359,7 @@
359 359 static unsigned int ps3vram_cache_match(struct ps3_system_bus_device *dev,
360 360 loff_t address)
361 361 {
362   - struct ps3vram_priv *priv = dev->core.driver_data;
  362 + struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);
363 363 struct ps3vram_cache *cache = &priv->cache;
364 364 unsigned int base;
365 365 unsigned int offset;
... ... @@ -393,7 +393,7 @@
393 393  
394 394 static int ps3vram_cache_init(struct ps3_system_bus_device *dev)
395 395 {
396   - struct ps3vram_priv *priv = dev->core.driver_data;
  396 + struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);
397 397  
398 398 priv->cache.page_count = CACHE_PAGE_COUNT;
399 399 priv->cache.page_size = CACHE_PAGE_SIZE;
... ... @@ -412,7 +412,7 @@
412 412  
413 413 static void ps3vram_cache_cleanup(struct ps3_system_bus_device *dev)
414 414 {
415   - struct ps3vram_priv *priv = dev->core.driver_data;
  415 + struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);
416 416  
417 417 ps3vram_cache_flush(dev);
418 418 kfree(priv->cache.tags);
... ... @@ -421,7 +421,7 @@
421 421 static int ps3vram_read(struct ps3_system_bus_device *dev, loff_t from,
422 422 size_t len, size_t *retlen, u_char *buf)
423 423 {
424   - struct ps3vram_priv *priv = dev->core.driver_data;
  424 + struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);
425 425 unsigned int cached, count;
426 426  
427 427 dev_dbg(&dev->core, "%s: from=0x%08x len=0x%zx\n", __func__,
... ... @@ -465,7 +465,7 @@
465 465 static int ps3vram_write(struct ps3_system_bus_device *dev, loff_t to,
466 466 size_t len, size_t *retlen, const u_char *buf)
467 467 {
468   - struct ps3vram_priv *priv = dev->core.driver_data;
  468 + struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);
469 469 unsigned int cached, count;
470 470  
471 471 if (to >= priv->size)
... ... @@ -528,7 +528,7 @@
528 528  
529 529 static void __devinit ps3vram_proc_init(struct ps3_system_bus_device *dev)
530 530 {
531   - struct ps3vram_priv *priv = dev->core.driver_data;
  531 + struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);
532 532 struct proc_dir_entry *pde;
533 533  
534 534 pde = proc_create_data(DEVICE_NAME, 0444, NULL, &ps3vram_proc_fops,
... ... @@ -540,7 +540,7 @@
540 540 static struct bio *ps3vram_do_bio(struct ps3_system_bus_device *dev,
541 541 struct bio *bio)
542 542 {
543   - struct ps3vram_priv *priv = dev->core.driver_data;
  543 + struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);
544 544 int write = bio_data_dir(bio) == WRITE;
545 545 const char *op = write ? "write" : "read";
546 546 loff_t offset = bio->bi_sector << 9;
... ... @@ -590,7 +590,7 @@
590 590 static int ps3vram_make_request(struct request_queue *q, struct bio *bio)
591 591 {
592 592 struct ps3_system_bus_device *dev = q->queuedata;
593   - struct ps3vram_priv *priv = dev->core.driver_data;
  593 + struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);
594 594 int busy;
595 595  
596 596 dev_dbg(&dev->core, "%s\n", __func__);
597 597  
... ... @@ -628,10 +628,8 @@
628 628  
629 629 spin_lock_init(&priv->lock);
630 630 bio_list_init(&priv->list);
631   - dev->core.driver_data = priv;
  631 + ps3_system_bus_set_driver_data(dev, priv);
632 632  
633   - priv = dev->core.driver_data;
634   -
635 633 /* Allocate XDR buffer (1MiB aligned) */
636 634 priv->xdr_buf = (void *)__get_free_pages(GFP_KERNEL,
637 635 get_order(XDR_BUF_SIZE));
638 636  
... ... @@ -795,14 +793,14 @@
795 793 free_pages((unsigned long) priv->xdr_buf, get_order(XDR_BUF_SIZE));
796 794 fail_free_priv:
797 795 kfree(priv);
798   - dev->core.driver_data = NULL;
  796 + ps3_system_bus_set_driver_data(dev, NULL);
799 797 fail:
800 798 return error;
801 799 }
802 800  
803 801 static int ps3vram_remove(struct ps3_system_bus_device *dev)
804 802 {
805   - struct ps3vram_priv *priv = dev->core.driver_data;
  803 + struct ps3vram_priv *priv = ps3_system_bus_get_driver_data(dev);
806 804  
807 805 del_gendisk(priv->gendisk);
808 806 put_disk(priv->gendisk);
... ... @@ -819,7 +817,7 @@
819 817 ps3_close_hv_device(dev);
820 818 free_pages((unsigned long) priv->xdr_buf, get_order(XDR_BUF_SIZE));
821 819 kfree(priv);
822   - dev->core.driver_data = NULL;
  820 + ps3_system_bus_set_driver_data(dev, NULL);
823 821 return 0;
824 822 }
825 823