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

Commit 92b83c8f authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: remove ->nice0 and ->nice2 fields from ide_drive_t 



* ->nice0 and ->nice2 ide_drive_t fields are always zero so remove them.

* IDE_NICE_0 and IDE_NICE_2 defines from <linux/hdreg.h> are no longer
  used by any kernel code so cover them with #ifndef/#endif __KERNEL__.

Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent b034304a

drivers/ide/ide.c

+1 −4
Original line number Diff line number Diff line
@@ -1035,11 +1035,8 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device 
		case HDIO_GET_NICE:

			return put_user(drive->dsc_overlap	<<	IDE_NICE_DSC_OVERLAP	|

					drive->atapi_overlap	<<	IDE_NICE_ATAPI_OVERLAP	|

					drive->nice0		<< 	IDE_NICE_0		|

					drive->nice1		<<	IDE_NICE_1		|

					drive->nice2		<<	IDE_NICE_2,

					drive->nice1 << IDE_NICE_1,

					(long __user *) arg);



#ifdef CONFIG_IDE_TASK_IOCTL

		case HDIO_DRIVE_TASKFILE:

		        if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RAWIO))

include/linux/hdreg.h

+3 −1
Original line number Diff line number Diff line
@@ -706,8 +706,10 @@ struct hd_driveid { 
 */

#define IDE_NICE_DSC_OVERLAP	(0)	/* per the DSC overlap protocol */

#define IDE_NICE_ATAPI_OVERLAP	(1)	/* not supported yet */

#define IDE_NICE_0		(2)	/* when sure that it won't affect us */

#define IDE_NICE_1		(3)	/* when probably won't affect us much */

#ifndef __KERNEL__

#define IDE_NICE_0		(2)	/* when sure that it won't affect us */

#define IDE_NICE_2		(4)	/* when we know it's on our expense */

#endif



#endif	/* _LINUX_HDREG_H */

include/linux/ide.h

+0 −2
Original line number Diff line number Diff line
@@ -407,8 +407,6 @@ typedef struct ide_drive_s { 
	unsigned no_unmask	: 1;	/* disallow setting unmask bit */

	unsigned no_io_32bit	: 1;	/* disallow enabling 32bit I/O */

	unsigned atapi_overlap	: 1;	/* ATAPI overlap (not supported) */

	unsigned nice0		: 1;	/* give obvious excess bandwidth */

	unsigned nice2		: 1;	/* give a share in our own bandwidth */

	unsigned doorlocking	: 1;	/* for removable only: door lock/unlock works */

	unsigned nodma		: 1;	/* disallow DMA */

	unsigned autotune	: 2;	/* 0=default, 1=autotune, 2=noautotune */