Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce7b0f46 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

[PATCH] devfs: Remove the gendisk devfs_name field as it's no longer needed 



And remove the now unneeded number field.
Also fixes all drivers that set these fields.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 96192ff1

arch/um/drivers/ubd_kern.c

+2 −6
Original line number Diff line number Diff line
@@ -637,14 +637,10 @@ static int ubd_new_disk(int major, u64 size, int unit, 
	disk->first_minor = unit << UBD_SHIFT;

	disk->fops = &ubd_blops;

	set_capacity(disk, size / 512);

	if(major == MAJOR_NR){

	if(major == MAJOR_NR)

		sprintf(disk->disk_name, "ubd%c", 'a' + unit);

		sprintf(disk->devfs_name, "ubd/disc%d", unit);

	}

	else {

	else

		sprintf(disk->disk_name, "ubd_fake%d", unit);

		sprintf(disk->devfs_name, "ubd_fake/disc%d", unit);

	}



	/* sysfs register (not for ide fake devices) */

	if (major == MAJOR_NR) {

drivers/block/DAC960.c

+0 −1
Original line number Diff line number Diff line
@@ -2530,7 +2530,6 @@ static boolean DAC960_RegisterBlockDevice(DAC960_Controller_T *Controller) 
	blk_queue_max_sectors(RequestQueue, Controller->MaxBlocksPerCommand);

	disk->queue = RequestQueue;

	sprintf(disk->disk_name, "rd/c%dd%d", Controller->ControllerNumber, n);

	sprintf(disk->devfs_name, "rd/host%d/target%d", Controller->ControllerNumber, n);

	disk->major = MajorNumber;

	disk->first_minor = n << DAC960_MaxPartitionsBits;

	disk->fops = &DAC960_BlockDeviceOperations;

drivers/block/acsi.c

+1 −4
Original line number Diff line number Diff line
@@ -1732,13 +1732,10 @@ int acsi_init( void ) 
		struct gendisk *disk = acsi_gendisk[i];

		sprintf(disk->disk_name, "ad%c", 'a'+i);

		aip = &acsi_info[NDevices];

		sprintf(disk->devfs_name, "ad/target%d/lun%d", aip->target, aip->lun);

		disk->major = ACSI_MAJOR;

		disk->first_minor = i << 4;

		if (acsi_info[i].type != HARDDISK) {

		if (acsi_info[i].type != HARDDISK)

			disk->minors = 1;

			strcat(disk->devfs_name, "/disc");

		}

		disk->fops = &acsi_fops;

		disk->private_data = &acsi_info[i];

		set_capacity(disk, acsi_info[i].size);

drivers/block/cciss.c

+0 −1
Original line number Diff line number Diff line
@@ -3248,7 +3248,6 @@ static int __devinit cciss_init_one(struct pci_dev *pdev, 


		q->queuedata = hba[i];

		sprintf(disk->disk_name, "cciss/c%dd%d", i, j);

		sprintf(disk->devfs_name, "cciss/host%d/target%d", i, j);

		disk->major = hba[i]->major;

		disk->first_minor = j << NWD_SHIFT;

		disk->fops = &cciss_fops;

drivers/block/cpqarray.c

+0 −2
Original line number Diff line number Diff line
@@ -1805,8 +1805,6 @@ static void getgeometry(int ctlr) 


				}



				sprintf(disk->devfs_name, "ida/c%dd%d", ctlr, log_unit);



				info_p->phys_drives =

				    sense_config_buf->ctlr_phys_drv;

				info_p->drv_assign_map