[PATCH 3/4] convert <linux/hdreg.h> users to use <linux/hdio_ioctls.h>

Following files don't need at all:

- arch/mips/jazz/setup.c
- arch/sh/boards/renesas/systemh/irq.c
- drivers/macintosh/mediabay.c
- drivers/scsi/hptiop.c
- drivers/usb/storage/freecom.c
- include/asm-powerpc/ide.h
- init/main.c

Convert the rest of files to use instead
(this also fixes them from accidentially pulling in).

Signed-off-by: Bartlomiej Zolnierkiewicz
---
arch/mips/jazz/setup.c | 1 -
arch/sh/boards/renesas/systemh/irq.c | 1 -
block/compat_ioctl.c | 2 +-
block/ioctl.c | 2 +-
drivers/block/DAC960.c | 2 +-
drivers/block/amiflop.c | 2 +-
drivers/block/aoe/aoeblk.c | 2 +-
drivers/block/aoe/aoechr.c | 2 +-
drivers/block/aoe/aoedev.c | 2 +-
drivers/block/aoe/aoemain.c | 2 +-
drivers/block/aoe/aoenet.c | 2 +-
drivers/block/cciss.c | 2 +-
drivers/block/cpqarray.c | 2 +-
drivers/block/floppy.c | 2 +-
drivers/block/paride/pd.c | 2 +-
drivers/block/paride/pf.c | 2 +-
drivers/block/sunvdc.c | 2 +-
drivers/block/sx8.c | 2 +-
drivers/block/umem.c | 2 +-
drivers/block/viodasd.c | 2 +-
drivers/block/virtio_blk.c | 2 +-
drivers/block/xd.c | 2 +-
drivers/block/xen-blkfront.c | 2 +-
drivers/macintosh/mediabay.c | 1 -
drivers/md/dm-ioctl.c | 2 +-
drivers/md/dm.c | 2 +-
drivers/md/dm.h | 2 +-
drivers/memstick/core/mspro_block.c | 2 +-
drivers/message/i2o/i2o_block.c | 2 +-
drivers/mmc/card/block.c | 2 +-
drivers/mtd/ftl.c | 2 +-
drivers/mtd/inftlcore.c | 2 +-
drivers/mtd/mtd_blkdevs.c | 2 +-
drivers/mtd/nftlcore.c | 2 +-
drivers/mtd/rfd_ftl.c | 2 +-
drivers/mtd/ssfdc.c | 2 +-
drivers/s390/block/dasd.c | 2 +-
drivers/s390/block/dasd_diag.c | 2 +-
drivers/s390/block/dasd_eckd.c | 2 +-
drivers/s390/block/dasd_fba.c | 2 +-
drivers/s390/block/dasd_int.h | 2 +-
drivers/s390/block/xpram.c | 2 +-
drivers/scsi/hptiop.c | 1 -
drivers/scsi/ipr.c | 2 +-
drivers/scsi/sd.c | 2 +-
drivers/usb/storage/freecom.c | 2 --
fs/partitions/ibm.c | 2 +-
include/asm-powerpc/ide.h | 1 -
include/linux/raid/md.h | 2 +-
init/main.c | 1 -
50 files changed, 43 insertions(+), 51 deletions(-)

Index: b/arch/mips/jazz/setup.c
================================================== =================
--- a/arch/mips/jazz/setup.c
+++ b/arch/mips/jazz/setup.c
@@ -10,7 +10,6 @@
* Copyright (C) 2007 by Thomas Bogendoerfer
*/
#include
-#include
#include
#include
#include
Index: b/arch/sh/boards/renesas/systemh/irq.c
================================================== =================
--- a/arch/sh/boards/renesas/systemh/irq.c
+++ b/arch/sh/boards/renesas/systemh/irq.c
@@ -12,7 +12,6 @@
#include
#include

-#include
#include
#include
#include
Index: b/block/compat_ioctl.c
================================================== =================
--- a/block/compat_ioctl.c
+++ b/block/compat_ioctl.c
@@ -5,7 +5,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
Index: b/block/ioctl.c
================================================== =================
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -1,7 +1,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
Index: b/drivers/block/DAC960.c
================================================== =================
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -29,7 +29,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
Index: b/drivers/block/amiflop.c
================================================== =================
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -56,7 +56,7 @@
#include

#include
-#include
+#include
#include
#include
#include
Index: b/drivers/block/aoe/aoeblk.c
================================================== =================
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -4,7 +4,7 @@
* block device routines
*/

-#include
+#include
#include
#include
#include
Index: b/drivers/block/aoe/aoechr.c
================================================== =================
--- a/drivers/block/aoe/aoechr.c
+++ b/drivers/block/aoe/aoechr.c
@@ -4,7 +4,7 @@
* AoE character device driver
*/

-#include
+#include
#include
#include
#include
Index: b/drivers/block/aoe/aoedev.c
================================================== =================
--- a/drivers/block/aoe/aoedev.c
+++ b/drivers/block/aoe/aoedev.c
@@ -4,7 +4,7 @@
* AoE device utility functions; maintains device list.
*/

-#include
+#include
#include
#include
#include
Index: b/drivers/block/aoe/aoemain.c
================================================== =================
--- a/drivers/block/aoe/aoemain.c
+++ b/drivers/block/aoe/aoemain.c
@@ -4,7 +4,7 @@
* Module initialization routines, discover timer
*/

-#include
+#include
#include
#include
#include "aoe.h"
Index: b/drivers/block/aoe/aoenet.c
================================================== =================
--- a/drivers/block/aoe/aoenet.c
+++ b/drivers/block/aoe/aoenet.c
@@ -4,7 +4,7 @@
* Ethernet portion of AoE driver
*/

-#include
+#include
#include
#include
#include
Index: b/drivers/block/cciss.c
================================================== =================
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -35,7 +35,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
Index: b/drivers/block/cpqarray.c
================================================== =================
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -33,7 +33,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
Index: b/drivers/block/floppy.c
================================================== =================
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -163,7 +163,7 @@ static int print_unex = 1;
#define FDPATCHES
#include
#include
-#include
+#include
#include
#include
#include
Index: b/drivers/block/paride/pd.c
================================================== =================
--- a/drivers/block/paride/pd.c
+++ b/drivers/block/paride/pd.c
@@ -147,7 +147,7 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_GEO,
#include
#include
#include
-#include
+#include
#include /* for the eject ioctl */
#include
#include
Index: b/drivers/block/paride/pf.c
================================================== =================
--- a/drivers/block/paride/pf.c
+++ b/drivers/block/paride/pf.c
@@ -147,7 +147,7 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_SLV,
#include
#include
#include
-#include
+#include
#include
#include
#include
Index: b/drivers/block/sunvdc.c
================================================== =================
--- a/drivers/block/sunvdc.c
+++ b/drivers/block/sunvdc.c
@@ -7,7 +7,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
Index: b/drivers/block/sx8.c
================================================== =================
--- a/drivers/block/sx8.c
+++ b/drivers/block/sx8.c
@@ -24,7 +24,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
Index: b/drivers/block/umem.c
================================================== =================
--- a/drivers/block/umem.c
+++ b/drivers/block/umem.c
@@ -50,7 +50,7 @@
#include

#include /* O_ACCMODE */
-#include /* HDIO_GETGEO */
+#include /* HDIO_GETGEO */

#include "umem.h"

Index: b/drivers/block/viodasd.c
================================================== =================
--- a/drivers/block/viodasd.c
+++ b/drivers/block/viodasd.c
@@ -34,7 +34,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
Index: b/drivers/block/virtio_blk.c
================================================== =================
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -1,7 +1,7 @@
//#define DEBUG
#include
#include
-#include
+#include
#include
#include
#include
Index: b/drivers/block/xd.c
================================================== =================
--- a/drivers/block/xd.c
+++ b/drivers/block/xd.c
@@ -41,7 +41,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
Index: b/drivers/block/xen-blkfront.c
================================================== =================
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -37,7 +37,7 @@

#include
#include
-#include
+#include
#include
#include

Index: b/drivers/macintosh/mediabay.c
================================================== =================
--- a/drivers/macintosh/mediabay.c
+++ b/drivers/macintosh/mediabay.c
@@ -16,7 +16,6 @@
#include
#include
#include
-#include
#include
#include
#include
Index: b/drivers/md/dm-ioctl.c
================================================== =================
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -14,7 +14,7 @@
#include
#include
#include
-#include
+#include
#include

#include
Index: b/drivers/md/dm.c
================================================== =================
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -19,7 +19,7 @@
#include
#include
#include
-#include
+#include
#include
#include

Index: b/drivers/md/dm.h
================================================== =================
--- a/drivers/md/dm.h
+++ b/drivers/md/dm.h
@@ -14,7 +14,7 @@
#include
#include
#include
-#include
+#include

/*
* Suspend feature flags
Index: b/drivers/memstick/core/mspro_block.c
================================================== =================
--- a/drivers/memstick/core/mspro_block.c
+++ b/drivers/memstick/core/mspro_block.c
@@ -14,7 +14,7 @@

#include
#include
-#include
+#include
#include
#include
#include
Index: b/drivers/message/i2o/i2o_block.c
================================================== =================
--- a/drivers/message/i2o/i2o_block.c
+++ b/drivers/message/i2o/i2o_block.c
@@ -57,7 +57,7 @@

#include
#include
-#include
+#include

#include

Index: b/drivers/mmc/card/block.c
================================================== =================
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -24,7 +24,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
Index: b/drivers/mtd/ftl.c
================================================== =================
--- a/drivers/mtd/ftl.c
+++ b/drivers/mtd/ftl.c
@@ -68,7 +68,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
Index: b/drivers/mtd/inftlcore.c
================================================== =================
--- a/drivers/mtd/inftlcore.c
+++ b/drivers/mtd/inftlcore.c
@@ -31,7 +31,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
Index: b/drivers/mtd/mtd_blkdevs.c
================================================== =================
--- a/drivers/mtd/mtd_blkdevs.c
+++ b/drivers/mtd/mtd_blkdevs.c
@@ -18,7 +18,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
Index: b/drivers/mtd/nftlcore.c
================================================== =================
--- a/drivers/mtd/nftlcore.c
+++ b/drivers/mtd/nftlcore.c
@@ -20,7 +20,7 @@
#include
#include
#include
-#include
+#include

#include
#include
Index: b/drivers/mtd/rfd_ftl.c
================================================== =================
--- a/drivers/mtd/rfd_ftl.c
+++ b/drivers/mtd/rfd_ftl.c
@@ -13,7 +13,7 @@
* based on ftl.c
*/

-#include
+#include
#include
#include
#include
Index: b/drivers/mtd/ssfdc.c
================================================== =================
--- a/drivers/mtd/ssfdc.c
+++ b/drivers/mtd/ssfdc.c
@@ -14,7 +14,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
Index: b/drivers/s390/block/dasd.c
================================================== =================
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -16,7 +16,7 @@
#include
#include
#include
-#include
+#include

#include
#include
Index: b/drivers/s390/block/dasd_diag.c
================================================== =================
--- a/drivers/s390/block/dasd_diag.c
+++ b/drivers/s390/block/dasd_diag.c
@@ -11,7 +11,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
Index: b/drivers/s390/block/dasd_eckd.c
================================================== =================
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -12,7 +12,7 @@
#include
#include
#include
-#include /* HDIO_GETGEO */
+#include /* HDIO_GETGEO */
#include
#include
#include
Index: b/drivers/s390/block/dasd_fba.c
================================================== =================
--- a/drivers/s390/block/dasd_fba.c
+++ b/drivers/s390/block/dasd_fba.c
@@ -11,7 +11,7 @@
#include

#include
-#include /* HDIO_GETGEO */
+#include /* HDIO_GETGEO */
#include
#include
#include
Index: b/drivers/s390/block/dasd_int.h
================================================== =================
--- a/drivers/s390/block/dasd_int.h
+++ b/drivers/s390/block/dasd_int.h
@@ -51,7 +51,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
Index: b/drivers/s390/block/xpram.c
================================================== =================
--- a/drivers/s390/block/xpram.c
+++ b/drivers/s390/block/xpram.c
@@ -33,7 +33,7 @@
#include
#include
#include
-#include /* HDIO_GETGEO */
+#include /* HDIO_GETGEO */
#include
#include
#include
Index: b/drivers/scsi/hptiop.c
================================================== =================
--- a/drivers/scsi/hptiop.c
+++ b/drivers/scsi/hptiop.c
@@ -25,7 +25,6 @@
#include
#include
#include
-#include
#include
#include
#include
Index: b/drivers/scsi/ipr.c
================================================== =================
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -71,7 +71,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
Index: b/drivers/scsi/sd.c
================================================== =================
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -38,7 +38,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
Index: b/drivers/usb/storage/freecom.c
================================================== =================
--- a/drivers/usb/storage/freecom.c
+++ b/drivers/usb/storage/freecom.c
@@ -26,8 +26,6 @@
* (http://www.freecom.de/)
*/

-#include
-
#include
#include

Index: b/fs/partitions/ibm.c
================================================== =================
--- a/fs/partitions/ibm.c
+++ b/fs/partitions/ibm.c
@@ -7,7 +7,7 @@
*/

#include
-#include
+#include
#include
#include
#include
Index: b/include/asm-powerpc/ide.h
================================================== =================
--- a/include/asm-powerpc/ide.h
+++ b/include/asm-powerpc/ide.h
@@ -20,7 +20,6 @@
#define __ide_mm_outsl(p, a, c) writesl((void __iomem *)(p), (a), (c))

#ifndef __powerpc64__
-#include
#include

/* FIXME: use ide_platform host driver */
Index: b/include/linux/raid/md.h
================================================== =================
--- a/include/linux/raid/md.h
+++ b/include/linux/raid/md.h
@@ -24,7 +24,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
Index: b/init/main.c
================================================== =================
--- a/init/main.c
+++ b/init/main.c
@@ -22,7 +22,6 @@
#include
#include
#include
-#include
#include
#include
#include
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

[PATCH 3/4] convert <linux/hdreg.h> users to use <linux/hdio_ioctls.h> - Kernel

Thread: [PATCH 3/4] convert <linux/hdreg.h> users to use <linux/hdio_ioctls.h>

LinkBack

Tools

[PATCH 3/4] convert <linux/hdreg.h> users to use <linux/hdio_ioctls.h>