convert <linux/hdreg.h> users to use <linux/hdio_ioctls.h>
Subsystems (23)
PATCH 3/4 convert <linux/hdreg.h> users to use <linux/hdio_ioctls.h>
Following files don't need <linux/hdreg.h> 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 <linux/hdio_ioctls.h> instead (this also fixes them from accidentially pulling <linux/ata.h> in).
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
--- 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(-)
arch/mips/jazz/setup.c +0 -1
@@ -10,7 +10,6 @@* Copyright (C) 2007 by Thomas Bogendoerfer */ #include <linux/eisa.h> -#include <linux/hdreg.h> #include <linux/init.h> #include <linux/ioport.h> #include <linux/sched.h>
arch/sh/boards/renesas/systemh/irq.c +0 -1
@@ -12,7 +12,6 @@#include <linux/init.h> #include <linux/irq.h> -#include <linux/hdreg.h> #include <linux/ide.h> #include <asm/io.h> #include <asm/systemh7751.h>
block/compat_ioctl.c +1 -1
@@ -5,7 +5,7 @@#include <linux/compat.h> #include <linux/elevator.h> #include <linux/fd.h> -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <linux/syscalls.h> #include <linux/smp_lock.h> #include <linux/types.h>
block/ioctl.c +1 -1
@@ -1,7 +1,7 @@#include <linux/capability.h> #include <linux/blkdev.h> #include <linux/blkpg.h> -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <linux/backing-dev.h> #include <linux/buffer_head.h> #include <linux/smp_lock.h>
drivers/block/DAC960.c +1 -1
@@ -29,7 +29,7 @@#include <linux/completion.h> #include <linux/delay.h> #include <linux/genhd.h> -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <linux/blkpg.h> #include <linux/dma-mapping.h> #include <linux/interrupt.h>
drivers/block/amiflop.c +1 -1
@@ -56,7 +56,7 @@#include <linux/module.h> #include <linux/fd.h> -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <linux/delay.h> #include <linux/init.h> #include <linux/amifdreg.h>
drivers/block/aoe/aoeblk.c +1 -1
@@ -4,7 +4,7 @@* block device routines */ -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <linux/blkdev.h> #include <linux/backing-dev.h> #include <linux/fs.h>
drivers/block/aoe/aoechr.c +1 -1
@@ -4,7 +4,7 @@* AoE character device driver */ -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/smp_lock.h>
drivers/block/aoe/aoedev.c +1 -1
@@ -4,7 +4,7 @@* AoE device utility functions; maintains device list. */ -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <linux/blkdev.h> #include <linux/netdevice.h> #include <linux/delay.h>
drivers/block/aoe/aoemain.c +1 -1
@@ -4,7 +4,7 @@* Module initialization routines, discover timer */ -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <linux/blkdev.h> #include <linux/module.h> #include "aoe.h"
drivers/block/aoe/aoenet.c +1 -1
@@ -4,7 +4,7 @@* Ethernet portion of AoE driver */ -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <linux/blkdev.h> #include <linux/netdevice.h> #include <linux/moduleparam.h>
drivers/block/cciss.c +1 -1
@@ -35,7 +35,7 @@#include <linux/proc_fs.h> #include <linux/seq_file.h> #include <linux/init.h> -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <linux/spinlock.h> #include <linux/compat.h> #include <linux/blktrace_api.h>
drivers/block/cpqarray.c +1 -1
@@ -33,7 +33,7 @@#include <linux/timer.h> #include <linux/proc_fs.h> #include <linux/init.h> -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <linux/spinlock.h> #include <linux/blkdev.h> #include <linux/genhd.h>
drivers/block/floppy.c +1 -1
@@ -163,7 +163,7 @@ static int print_unex = 1;#define FDPATCHES #include <linux/fdreg.h> #include <linux/fd.h> -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <linux/errno.h> #include <linux/slab.h> #include <linux/mm.h>
drivers/block/paride/pd.c +1 -1
@@ -147,7 +147,7 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_GEO,#include <linux/module.h> #include <linux/fs.h> #include <linux/delay.h> -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <linux/cdrom.h> /* for the eject ioctl */ #include <linux/blkdev.h> #include <linux/blkpg.h>
drivers/block/paride/pf.c +1 -1
@@ -147,7 +147,7 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_SLV,#include <linux/init.h> #include <linux/fs.h> #include <linux/delay.h> -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <linux/cdrom.h> #include <linux/spinlock.h> #include <linux/blkdev.h>
drivers/block/sunvdc.c +1 -1
@@ -7,7 +7,7 @@#include <linux/kernel.h> #include <linux/types.h> #include <linux/blkdev.h> -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <linux/genhd.h> #include <linux/slab.h> #include <linux/spinlock.h>
drivers/block/sx8.c +1 -1
@@ -24,7 +24,7 @@#include <linux/bitops.h> #include <linux/delay.h> #include <linux/time.h> -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <linux/dma-mapping.h> #include <linux/completion.h> #include <linux/scatterlist.h>
drivers/block/umem.c +1 -1
@@ -50,7 +50,7 @@#include <linux/dma-mapping.h> #include <linux/fcntl.h> /* O_ACCMODE */ -#include <linux/hdreg.h> /* HDIO_GETGEO */ +#include <linux/hdio_ioctls.h> /* HDIO_GETGEO */ #include "umem.h"
drivers/block/viodasd.c +1 -1
@@ -34,7 +34,7 @@#include <linux/kernel.h> #include <linux/blkdev.h> #include <linux/genhd.h> -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <linux/errno.h> #include <linux/init.h> #include <linux/string.h>
drivers/block/virtio_blk.c +1 -1
@@ -1,7 +1,7 @@//#define DEBUG #include <linux/spinlock.h> #include <linux/blkdev.h> -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <linux/virtio.h> #include <linux/virtio_blk.h> #include <linux/scatterlist.h>
drivers/block/xd.c +1 -1
@@ -41,7 +41,7 @@#include <linux/kernel.h> #include <linux/timer.h> #include <linux/genhd.h> -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <linux/ioport.h> #include <linux/init.h> #include <linux/wait.h>
drivers/block/xen-blkfront.c +1 -1
@@ -37,7 +37,7 @@#include <linux/interrupt.h> #include <linux/blkdev.h> -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <linux/cdrom.h> #include <linux/module.h>
drivers/macintosh/mediabay.c +0 -1
@@ -16,7 +16,6 @@#include <linux/delay.h> #include <linux/sched.h> #include <linux/timer.h> -#include <linux/hdreg.h> #include <linux/stddef.h> #include <linux/init.h> #include <linux/ide.h>
drivers/md/dm-ioctl.c +1 -1
@@ -14,7 +14,7 @@#include <linux/wait.h> #include <linux/slab.h> #include <linux/dm-ioctl.h> -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <linux/compat.h> #include <asm/uaccess.h>
drivers/md/dm.c +1 -1
@@ -19,7 +19,7 @@#include <linux/mempool.h> #include <linux/slab.h> #include <linux/idr.h> -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <linux/blktrace_api.h> #include <linux/smp_lock.h>
drivers/md/dm.h +1 -1
@@ -14,7 +14,7 @@#include <linux/device-mapper.h> #include <linux/list.h> #include <linux/blkdev.h> -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> /* * Suspend feature flags
drivers/memstick/core/mspro_block.c +1 -1
@@ -14,7 +14,7 @@#include <linux/blkdev.h> #include <linux/idr.h> -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <linux/kthread.h> #include <linux/delay.h> #include <linux/memstick.h>
drivers/message/i2o/i2o_block.c +1 -1
@@ -57,7 +57,7 @@#include <linux/genhd.h> #include <linux/blkdev.h> -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <scsi/scsi.h>
drivers/mmc/card/block.c +1 -1
@@ -24,7 +24,7 @@#include <linux/kernel.h> #include <linux/fs.h> #include <linux/errno.h> -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <linux/kdev_t.h> #include <linux/blkdev.h> #include <linux/mutex.h>
drivers/mtd/ftl.c +1 -1
@@ -68,7 +68,7 @@#include <linux/major.h> #include <linux/fs.h> #include <linux/init.h> -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <linux/vmalloc.h> #include <linux/blkpg.h> #include <asm/uaccess.h>
drivers/mtd/inftlcore.c +1 -1
@@ -31,7 +31,7 @@#include <linux/sched.h> #include <linux/init.h> #include <linux/kmod.h> -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <linux/mtd/mtd.h> #include <linux/mtd/nftl.h> #include <linux/mtd/inftl.h>
drivers/mtd/mtd_blkdevs.c +1 -1
@@ -18,7 +18,7 @@#include <linux/blkpg.h> #include <linux/freezer.h> #include <linux/spinlock.h> -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <linux/init.h> #include <linux/mutex.h> #include <linux/kthread.h>
drivers/mtd/nftlcore.c +1 -1
@@ -20,7 +20,7 @@#include <linux/delay.h> #include <linux/slab.h> #include <linux/init.h> -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <linux/kmod.h> #include <linux/mtd/mtd.h>
drivers/mtd/rfd_ftl.c +1 -1
@@ -13,7 +13,7 @@* based on ftl.c */ -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <linux/init.h> #include <linux/mtd/blktrans.h> #include <linux/mtd/mtd.h>
drivers/mtd/ssfdc.c +1 -1
@@ -14,7 +14,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/slab.h> -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> #include <linux/mtd/blktrans.h>
drivers/s390/block/dasd.c +1 -1
@@ -16,7 +16,7 @@#include <linux/major.h> #include <linux/slab.h> #include <linux/buffer_head.h> -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <asm/ccwdev.h> #include <asm/ebcdic.h>
drivers/s390/block/dasd_diag.c +1 -1
@@ -11,7 +11,7 @@#include <linux/stddef.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <linux/bio.h> #include <linux/module.h> #include <linux/init.h>
drivers/s390/block/dasd_eckd.c +1 -1
@@ -12,7 +12,7 @@#include <linux/stddef.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <linux/hdreg.h> /* HDIO_GETGEO */ +#include <linux/hdio_ioctls.h> /* HDIO_GETGEO */ #include <linux/bio.h> #include <linux/module.h> #include <linux/init.h>
drivers/s390/block/dasd_fba.c +1 -1
@@ -11,7 +11,7 @@#include <asm/debug.h> #include <linux/slab.h> -#include <linux/hdreg.h> /* HDIO_GETGEO */ +#include <linux/hdio_ioctls.h> /* HDIO_GETGEO */ #include <linux/bio.h> #include <linux/module.h> #include <linux/init.h>
drivers/s390/block/dasd_int.h +1 -1
@@ -51,7 +51,7 @@#include <linux/wait.h> #include <linux/blkdev.h> #include <linux/genhd.h> -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <linux/interrupt.h> #include <linux/log2.h> #include <asm/ccwdev.h>
drivers/s390/block/xpram.c +1 -1
@@ -33,7 +33,7 @@#include <linux/slab.h> #include <linux/blkdev.h> #include <linux/blkpg.h> -#include <linux/hdreg.h> /* HDIO_GETGEO */ +#include <linux/hdio_ioctls.h> /* HDIO_GETGEO */ #include <linux/sysdev.h> #include <linux/bio.h> #include <asm/uaccess.h>
drivers/scsi/hptiop.c +0 -1
@@ -25,7 +25,6 @@#include <linux/delay.h> #include <linux/timer.h> #include <linux/spinlock.h> -#include <linux/hdreg.h> #include <asm/uaccess.h> #include <asm/io.h> #include <asm/div64.h>
drivers/scsi/ipr.c +1 -1
@@ -71,7 +71,7 @@#include <linux/module.h> #include <linux/moduleparam.h> #include <linux/libata.h> -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <asm/io.h> #include <asm/irq.h> #include <asm/processor.h>
drivers/scsi/sd.c +1 -1
@@ -38,7 +38,7 @@#include <linux/mm.h> #include <linux/bio.h> #include <linux/genhd.h> -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <linux/errno.h> #include <linux/idr.h> #include <linux/interrupt.h>
drivers/usb/storage/freecom.c +0 -2
@@ -26,8 +26,6 @@* (http://www.freecom.de/) */ -#include <linux/hdreg.h> -#include <scsi/scsi.h> #include <scsi/scsi_cmnd.h>
fs/partitions/ibm.c +1 -1
@@ -7,7 +7,7 @@*/ #include <linux/buffer_head.h> -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <linux/slab.h> #include <asm/dasd.h> #include <asm/ebcdic.h>
include/asm-powerpc/ide.h +0 -1
@@ -20,7 +20,6 @@#define __ide_mm_outsl (p, a, c) writesl((void __iomem *)(p), (a), (c))#ifndef __powerpc64__ -#include <linux/hdreg.h> #include <linux/ioport.h> /* FIXME: use ide_platform host driver */
include/linux/raid/md.h +1 -1
@@ -24,7 +24,7 @@#include <linux/types.h> #include <linux/bitops.h> #include <linux/module.h> -#include <linux/hdreg.h> +#include <linux/hdio_ioctls.h> #include <linux/proc_fs.h> #include <linux/seq_file.h> #include <linux/smp_lock.h>
init/main.c +0 -1
@@ -22,7 +22,6 @@#include <linux/init.h> #include <linux/smp_lock.h> #include <linux/initrd.h> -#include <linux/hdreg.h> #include <linux/bootmem.h> #include <linux/tty.h> #include <linux/gfp.h>