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

Commit 5ceadd2a authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds
Browse files

Atari floppy: Rename disk_type to atari_disk_type 



Commit edfaa7c3

    Driver core: convert block from raw kobjects to core devices

    This moves the block devices to /sys/class/block. It will create a
    flat list of all block devices, with the disks and partitions in one
    directory. For compatibility /sys/block is created and contains symlinks
    to the disks.

introduced a global disk_type variable in <linux/genhd.h>, causing the
following compile error on Atari:

    drivers/block/ataflop.c:93: error: conflicting types for 'disk_type'
    include/linux/genhd.h:21: error: previous declaration of 'disk_type' was here

Rename the local disk_type variable in drivers/block/ataflop.c to
atari_disk_type, to avoid the conflict.

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7129b126

drivers/block/ataflop.c

+8 −8
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static struct atari_disk_type { 
	unsigned	blocks;		/* total number of blocks */

	unsigned	fdc_speed;	/* fdc_speed setting */

	unsigned 	stretch;	/* track doubling ? */

} disk_type[] = {

} atari_disk_type[] = {

	{ "d360",  9, 720, 0, 0},	/*  0: 360kB diskette */

	{ "D360",  9, 720, 0, 1},	/*  1: 360kb in 720k or 1.2MB drive */

	{ "D720",  9,1440, 0, 0},	/*  2: 720kb in 720k or 1.2MB drive */
@@ -658,7 +658,7 @@ static int do_format(int drive, int type, struct atari_format_descr *desc) 
			return -EINVAL;

		}

		type = minor2disktype[type].index;

		UDT = &disk_type[type];

		UDT = &atari_disk_type[type];

	}



	if (!UDT || desc->track >= UDT->blocks/UDT->spt/2 || desc->head >= 2) {
@@ -1064,7 +1064,7 @@ static void fd_rwsec_done1(int status) 
	       searched for a non-existent sector! */

	    !(read_track && FDC_READ(FDCREG_SECTOR) > SUDT->spt)) {

		if (Probing) {

			if (SUDT > disk_type) {

			if (SUDT > atari_disk_type) {

			    if (SUDT[-1].blocks > ReqBlock) {

				/* try another disk type */

				SUDT--;
@@ -1082,7 +1082,7 @@ static void fd_rwsec_done1(int status) 
		} else {	

/* record not found, but not probing. Maybe stretch wrong ? Restart probing */

			if (SUD.autoprobe) {

				SUDT = disk_type + StartDiskType[DriveType];

				SUDT = atari_disk_type + StartDiskType[DriveType];

				set_capacity(unit[SelectedDrive].disk,

							SUDT->blocks);

				Probing = 1;
@@ -1421,7 +1421,7 @@ static void redo_fd_request(void) 
	if (type == 0) {

		if (!UDT) {

			Probing = 1;

			UDT = disk_type + StartDiskType[DriveType];

			UDT = atari_disk_type + StartDiskType[DriveType];

			set_capacity(floppy->disk, UDT->blocks);

			UD.autoprobe = 1;

		}
@@ -1439,7 +1439,7 @@ static void redo_fd_request(void) 
			goto repeat;

		}

		type = minor2disktype[type].index;

		UDT = &disk_type[type];

		UDT = &atari_disk_type[type];

		set_capacity(floppy->disk, UDT->blocks);

		UD.autoprobe = 0;

	}
@@ -1505,7 +1505,7 @@ static int fd_ioctl(struct inode *inode, struct file *filp, 
			if (minor2disktype[type].drive_types > DriveType)

				return -ENODEV;

			type = minor2disktype[type].index;

			dtp = &disk_type[type];

			dtp = &atari_disk_type[type];

			if (UD.flags & FTD_MSG)

			    printk (KERN_ERR "floppy%d: found dtp %p name %s!\n",

			        drive, dtp, dtp->name);
@@ -1576,7 +1576,7 @@ static int fd_ioctl(struct inode *inode, struct file *filp, 
				continue;

			}

			setidx = minor2disktype[settype].index;

			dtp = &disk_type[setidx];

			dtp = &atari_disk_type[setidx];



			/* found matching entry ?? */

			if (   dtp->blocks  == setprm.size