Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9232c14b authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: remove ->bus_state field from ide_hwif_t 



It is always set to BUSSTATE_ON.

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent feb22b7f

drivers/ide/ide.c

+1 −3
Original line number Diff line number Diff line
@@ -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;

include/linux/ide.h

+0 −1
Original line number Diff line number Diff line
@@ -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;