From 2888da562e53bc4ed46377c6548f96dbb490da0b Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Fri, 10 Oct 2008 22:39:33 +0200 Subject: [PATCH] --- yaml --- r: 112901 b: refs/heads/master c: 9232c14bff36d65de254f34386c00b732c5b6099 h: refs/heads/master i: 112899: 2052a5db990d368a4e09734e8517a2ad3a3dfee5 v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide.c | 4 +--- trunk/include/linux/ide.h | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index fbc786b3663d..badeda63e109 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: feb22b7f8e62b1b987a3a1dbad95af767a1df832 +refs/heads/master: 9232c14bff36d65de254f34386c00b732c5b6099 diff --git a/trunk/drivers/ide/ide.c b/trunk/drivers/ide/ide.c index f42de5fe9bc2..f78e789ea5f7 100644 --- a/trunk/drivers/ide/ide.c +++ b/trunk/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/trunk/include/linux/ide.h b/trunk/include/linux/ide.h index 2c5d83ddaef6..42f39781af87 100644 --- a/trunk/include/linux/ide.h +++ b/trunk/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;