Re: [PATCH] Atari floppy: Rename disk_type to atari_disk_type
On Sun, Jan 27, 2008 at 02:28:35PM +0100, Geert Uytterhoeven wrote: > Atari floppy: Rename disk_type to atari_disk_type > > Commit edfaa7c36574f1bf09c65ad602412db9da5f96bf > > 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 , 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: Geert Uytterhoeven <[EMAIL PROTECTED]> > Cc: Kay Sievers <[EMAIL PROTECTED]> > Cc: Greg Kroah-Hartman <[EMAIL PROTECTED]> Acked-by: Greg Kroah-Hartman <[EMAIL PROTECTED]> -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] Atari floppy: Rename disk_type to atari_disk_type
On Sun, Jan 27, 2008 at 02:28:35PM +0100, Geert Uytterhoeven wrote: Atari floppy: Rename disk_type to atari_disk_type Commit edfaa7c36574f1bf09c65ad602412db9da5f96bf 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: Geert Uytterhoeven [EMAIL PROTECTED] Cc: Kay Sievers [EMAIL PROTECTED] Cc: Greg Kroah-Hartman [EMAIL PROTECTED] Acked-by: Greg Kroah-Hartman [EMAIL PROTECTED] -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] Atari floppy: Rename disk_type to atari_disk_type
Atari floppy: Rename disk_type to atari_disk_type
Commit edfaa7c36574f1bf09c65ad602412db9da5f96bf
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 , 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: Geert Uytterhoeven <[EMAIL PROTECTED]>
Cc: Kay Sievers <[EMAIL PROTECTED]>
Cc: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
drivers/block/ataflop.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -90,7 +90,7 @@ static struct atari_disk_type {
unsignedblocks; /* total number of blocks */
unsignedfdc_speed; /* fdc_speed setting */
unsignedstretch;/* 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
return -EINVAL;
}
type = minor2disktype[type].index;
- UDT = _type[type];
+ UDT = _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 @@ repeat:
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 @@ repeat:
goto repeat;
}
type = minor2disktype[type].index;
- UDT = _type[type];
+ UDT = _disk_type[type];
set_capacity(floppy->disk, UDT->blocks);
UD.autoprobe = 0;
}
@@ -1505,7 +1505,7 @@ static int fd_ioctl(struct inode *inode,
if (minor2disktype[type].drive_types > DriveType)
return -ENODEV;
type = minor2disktype[type].index;
- dtp = _type[type];
+ dtp = _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,
continue;
}
setidx = minor2disktype[settype].index;
- dtp = _type[setidx];
+ dtp = _disk_type[setidx];
/* found matching entry ?? */
if ( dtp->blocks == setprm.size
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [EMAIL PROTECTED]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
--
To unsubscribe from
[PATCH] Atari floppy: Rename disk_type to atari_disk_type
Atari floppy: Rename disk_type to atari_disk_type
Commit edfaa7c36574f1bf09c65ad602412db9da5f96bf
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: Geert Uytterhoeven [EMAIL PROTECTED]
Cc: Kay Sievers [EMAIL PROTECTED]
Cc: Greg Kroah-Hartman [EMAIL PROTECTED]
---
drivers/block/ataflop.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -90,7 +90,7 @@ static struct atari_disk_type {
unsignedblocks; /* total number of blocks */
unsignedfdc_speed; /* fdc_speed setting */
unsignedstretch;/* 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
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 @@ repeat:
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 @@ repeat:
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,
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,
continue;
}
setidx = minor2disktype[settype].index;
- dtp = disk_type[setidx];
+ dtp = atari_disk_type[setidx];
/* found matching entry ?? */
if ( dtp-blocks == setprm.size
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [EMAIL PROTECTED]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say programmer or something like that.
-- Linus Torvalds
--
To
