summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-10-10 22:39:33 +0200
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-10-10 22:39:33 +0200
commit9232c14bff36d65de254f34386c00b732c5b6099 (patch)
tree12035301709647a6b0cc2d58b554233dc0756be6
parentfeb22b7f8e62b1b987a3a1dbad95af767a1df832 (diff)
downloadlinux-9232c14bff36d65de254f34386c00b732c5b6099.tar.gz
linux-9232c14bff36d65de254f34386c00b732c5b6099.tar.bz2
linux-9232c14bff36d65de254f34386c00b732c5b6099.zip
ide: remove ->bus_state field from ide_hwif_t
It is always set to BUSSTATE_ON. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
-rw-r--r--drivers/ide/ide.c4
-rw-r--r--include/linux/ide.h1
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index f42de5fe9bc2..f78e789ea5f7 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -96,8 +96,6 @@ void ide_init_port_data(ide_hwif_t *hwif, unsigned int index)
hwif->name[2] = 'e';
hwif->name[3] = '0' + index;
- hwif->bus_state = BUSSTATE_ON;
-
init_completion(&hwif->gendev_rel_comp);
hwif->tp_ops = &default_tp_ops;
@@ -620,7 +618,7 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device
case HDIO_GET_BUSSTATE:
if (!capable(CAP_SYS_ADMIN))
return -EACCES;
- if (put_user(HWIF(drive)->bus_state, (long __user *)arg))
+ if (put_user(BUSSTATE_ON, (long __user *)arg))
return -EFAULT;
return 0;
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 2c5d83ddaef6..42f39781af87 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -562,7 +562,6 @@ typedef struct hwif_s {
u8 major; /* our major number */
u8 index; /* 0 for ide0; 1 for ide1; ... */
u8 channel; /* for dual-port chips: 0=primary, 1=secondary */
- u8 bus_state; /* power state of the IDE bus */
u32 host_flags;