Commit 0d52c756 authored by Dan Williams's avatar Dan Williams
Browse files

block: convert to device_add_disk() 



For block drivers that specify a parent device, convert them to use
device_add_disk().

This conversion was done with the following semantic patch:

    @@
    struct gendisk *disk;
    expression E;
    @@

    - disk->driverfs_dev = E;
    ...
    - add_disk(disk);
    + device_add_disk(E, disk);

    @@
    struct gendisk *disk;
    expression E1, E2;
    @@

    - disk->driverfs_dev = E1;
    ...
    E2 = disk;
    ...
    - add_disk(E2);
    + device_add_disk(E1, E2);

...plus some manual fixups for a few missed conversions.

Cc: Jens Axboe <axboe@fb.com>
Cc: Keith Busch <keith.busch@intel.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: David S. Miller <davem@davemloft.net>
Cc: James Bottomley <James.Bottomley@hansenpartnership.com>
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent d72a5783

arch/powerpc/sysdev/axonram.c

+1 −2
Original line number Diff line number Diff line
@@ -223,7 +223,6 @@ static int axon_ram_probe(struct platform_device *device) 
	bank->disk->first_minor = azfs_minor;

	bank->disk->fops = &axon_ram_devops;

	bank->disk->private_data = bank;

	bank->disk->driverfs_dev = &device->dev;



	sprintf(bank->disk->disk_name, "%s%d",

			AXON_RAM_DEVICE_NAME, axon_ram_bank_id);
@@ -238,7 +237,7 @@ static int axon_ram_probe(struct platform_device *device) 
	set_capacity(bank->disk, bank->size >> AXON_RAM_SECTOR_SHIFT);

	blk_queue_make_request(bank->disk->queue, axon_ram_make_request);

	blk_queue_logical_block_size(bank->disk->queue, AXON_RAM_SECTOR_SIZE);

	add_disk(bank->disk);

	device_add_disk(&device->dev, bank->disk);



	bank->irq_id = irq_of_parse_and_map(device->dev.of_node, 0);

	if (bank->irq_id == NO_IRQ) {

drivers/block/cciss.c

+1 −2
Original line number Diff line number Diff line
@@ -1951,7 +1951,6 @@ static int cciss_add_disk(ctlr_info_t *h, struct gendisk *disk, 
	if (cciss_create_ld_sysfs_entry(h, drv_index))

		goto cleanup_queue;

	disk->private_data = h->drv[drv_index];

	disk->driverfs_dev = &h->drv[drv_index]->dev;



	/* Set up queue information */

	blk_queue_bounce_limit(disk->queue, h->pdev->dma_mask);
@@ -1973,7 +1972,7 @@ static int cciss_add_disk(ctlr_info_t *h, struct gendisk *disk, 
	/* allows the interrupt handler to start the queue */

	wmb();

	h->drv[drv_index]->queue = disk->queue;

	add_disk(disk);

	device_add_disk(&h->drv[drv_index]->dev, disk);

	return 0;



cleanup_queue:

drivers/block/floppy.c

+1 −2
Original line number Diff line number Diff line
@@ -4350,8 +4350,7 @@ static int __init do_floppy_init(void) 
		/* to be cleaned up... */

		disks[drive]->private_data = (void *)(long)drive;

		disks[drive]->flags |= GENHD_FL_REMOVABLE;

		disks[drive]->driverfs_dev = &floppy_device[drive].dev;

		add_disk(disks[drive]);

		device_add_disk(&floppy_device[drive].dev, disks[drive]);

	}



	return 0;

drivers/block/mtip32xx/mtip32xx.c

+2 −3
Original line number Diff line number Diff line
@@ -3956,7 +3956,6 @@ static int mtip_block_initialize(struct driver_data *dd) 
	if (rv)

		goto disk_index_error;



	dd->disk->driverfs_dev	= &dd->pdev->dev;

	dd->disk->major		= dd->major;

	dd->disk->first_minor	= index * MTIP_MAX_MINORS;

	dd->disk->minors 	= MTIP_MAX_MINORS;
@@ -4008,7 +4007,7 @@ skip_create_disk: 


	/*

	 * if rebuild pending, start the service thread, and delay the block

	 * queue creation and add_disk()

	 * queue creation and device_add_disk()

	 */

	if (wait_for_rebuild == MTIP_FTL_REBUILD_MAGIC)

		goto start_service_thread;
@@ -4042,7 +4041,7 @@ skip_create_disk: 
	set_capacity(dd->disk, capacity);



	/* Enable the block device and add it to /dev */

	add_disk(dd->disk);

	device_add_disk(&dd->pdev->dev, dd->disk);



	dd->bdev = bdget_disk(dd->disk, 0);

	/*

drivers/block/ps3disk.c

+1 −2
Original line number Diff line number Diff line
@@ -487,7 +487,6 @@ static int ps3disk_probe(struct ps3_system_bus_device *_dev) 
	gendisk->fops = &ps3disk_fops;

	gendisk->queue = queue;

	gendisk->private_data = dev;

	gendisk->driverfs_dev = &dev->sbd.core;

	snprintf(gendisk->disk_name, sizeof(gendisk->disk_name), PS3DISK_NAME,

		 devidx+'a');

	priv->blocking_factor = dev->blk_size >> 9;
@@ -499,7 +498,7 @@ static int ps3disk_probe(struct ps3_system_bus_device *_dev) 
		 gendisk->disk_name, priv->model, priv->raw_capacity >> 11,

		 get_capacity(gendisk) >> 11);



	add_disk(gendisk);

	device_add_disk(&dev->sbd.core, gendisk);

	return 0;



fail_cleanup_queue:

CRA Git | Maintained and supported by SUSTech CRA and CCSE