Skip to content

Commit

Permalink
ide: remove ->bus_state field from ide_hwif_t
Browse files Browse the repository at this point in the history
It is always set to BUSSTATE_ON.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Oct 10, 2008
1 parent feb22b7 commit 9232c14
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
4 changes: 1 addition & 3 deletions drivers/ide/ide.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down
1 change: 0 additions & 1 deletion include/linux/ide.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 9232c14

Please sign in to comment.