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

Commit ca1b96e0 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: replace special_t typedef by IDE_SFLAG_* flags 



Replace:
- special_t typedef by IDE_SFLAG_* flags
- 'special_t special' ide_drive_t's field by 'u8 special_flags' one

There should be no functional changes caused by this patch.

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

drivers/ide/ide-disk.c

+2 −2
Original line number Diff line number Diff line
@@ -428,14 +428,14 @@ static int set_multcount(ide_drive_t *drive, int arg) 
	if (arg < 0 || arg > (drive->id[ATA_ID_MAX_MULTSECT] & 0xff))

		return -EINVAL;



	if (drive->special.b.set_multmode)

	if (drive->special_flags & IDE_SFLAG_SET_MULTMODE)

		return -EBUSY;



	rq = blk_get_request(drive->queue, READ, __GFP_WAIT);

	rq->cmd_type = REQ_TYPE_ATA_TASKFILE;



	drive->mult_req = arg;

	drive->special.b.set_multmode = 1;

	drive->special_flags |= IDE_SFLAG_SET_MULTMODE;

	error = blk_execute_rq(drive->queue, NULL, rq, 0);

	blk_put_request(rq);

drivers/ide/ide-eh.c

+4 −5
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static ide_startstop_t ide_ata_error(ide_drive_t *drive, struct request *rq, 
	}



	if ((rq->errors & ERROR_RECAL) == ERROR_RECAL)

		drive->special.b.recalibrate = 1;

		drive->special_flags |= IDE_SFLAG_RECALIBRATE;



	++rq->errors;
@@ -268,9 +268,8 @@ static void ide_disk_pre_reset(ide_drive_t *drive) 
{

	int legacy = (drive->id[ATA_ID_CFS_ENABLE_2] & 0x0400) ? 0 : 1;



	drive->special.all = 0;

	drive->special.b.set_geometry = legacy;

	drive->special.b.recalibrate  = legacy;

	drive->special_flags =

		legacy ? (IDE_SFLAG_SET_GEOMETRY | IDE_SFLAG_RECALIBRATE) : 0;



	drive->mult_count = 0;

	drive->dev_flags &= ~IDE_DFLAG_PARKED;
@@ -280,7 +279,7 @@ static void ide_disk_pre_reset(ide_drive_t *drive) 
		drive->mult_req = 0;



	if (drive->mult_req != drive->mult_count)

		drive->special.b.set_multmode = 1;

		drive->special_flags |= IDE_SFLAG_SET_MULTMODE;

}



static void pre_reset(ide_drive_t *drive)

drivers/ide/ide-io.c

+11 −10
Original line number Diff line number Diff line
@@ -194,14 +194,14 @@ static void ide_tf_set_setmult_cmd(ide_drive_t *drive, struct ide_taskfile *tf) 


static ide_startstop_t do_special(ide_drive_t *drive)

{

	special_t *s = &drive->special;

	struct ide_cmd cmd;



#ifdef DEBUG

	printk(KERN_DEBUG "%s: %s: 0x%02x\n", drive->name, __func__, s->all);

	printk(KERN_DEBUG "%s: %s: 0x%02x\n", drive->name, __func__,

		drive->special_flags);

#endif

	if (drive->media != ide_disk) {

		s->all = 0;

		drive->special_flags = 0;

		drive->mult_req = 0;

		return ide_stopped;

	}
@@ -209,14 +209,14 @@ static ide_startstop_t do_special(ide_drive_t *drive) 
	memset(&cmd, 0, sizeof(cmd));

	cmd.protocol = ATA_PROT_NODATA;



	if (s->b.set_geometry) {

		s->b.set_geometry = 0;

	if (drive->special_flags & IDE_SFLAG_SET_GEOMETRY) {

		drive->special_flags &= ~IDE_SFLAG_SET_GEOMETRY;

		ide_tf_set_specify_cmd(drive, &cmd.tf);

	} else if (s->b.recalibrate) {

		s->b.recalibrate = 0;

	} else if (drive->special_flags & IDE_SFLAG_RECALIBRATE) {

		drive->special_flags &= ~IDE_SFLAG_RECALIBRATE;

		ide_tf_set_restore_cmd(drive, &cmd.tf);

	} else if (s->b.set_multmode) {

		s->b.set_multmode = 0;

	} else if (drive->special_flags & IDE_SFLAG_SET_MULTMODE) {

		drive->special_flags &= ~IDE_SFLAG_SET_MULTMODE;

		ide_tf_set_setmult_cmd(drive, &cmd.tf);

	} else

		BUG();
@@ -339,7 +339,8 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq) 
		printk(KERN_ERR "%s: drive not ready for command\n", drive->name);

		return startstop;

	}

	if (!drive->special.all) {



	if (drive->special_flags == 0) {

		struct ide_driver *drv;



		/*

drivers/ide/ide-probe.c

+3 −3
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static void ide_disk_init_mult_count(ide_drive_t *drive) 
		drive->mult_req = id[ATA_ID_MULTSECT] & 0xff;



		if (drive->mult_req)

			drive->special.b.set_multmode = 1;

			drive->special_flags |= IDE_SFLAG_SET_MULTMODE;

	}

}
@@ -1138,8 +1138,8 @@ static void ide_port_init_devices_data(ide_hwif_t *hwif) 
		drive->hwif			= hwif;

		drive->ready_stat		= ATA_DRDY;

		drive->bad_wstat		= BAD_W_STAT;

		drive->special.b.recalibrate	= 1;

		drive->special.b.set_geometry	= 1;

		drive->special_flags		= IDE_SFLAG_RECALIBRATE |

						  IDE_SFLAG_SET_GEOMETRY;

		drive->name[0]			= 'h';

		drive->name[1]			= 'd';

		drive->name[2]			= 'a' + j;

drivers/ide/ide-taskfile.c

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ static ide_startstop_t task_no_data_intr(ide_drive_t *drive) 
	if (!OK_STAT(stat, ATA_DRDY, BAD_STAT)) {

		if (custom && tf->command == ATA_CMD_SET_MULTI) {

			drive->mult_req = drive->mult_count = 0;

			drive->special.b.recalibrate = 1;

			drive->special_flags |= IDE_SFLAG_RECALIBRATE;

			(void)ide_dump_status(drive, __func__, stat);

			return ide_stopped;

		} else if (custom && tf->command == ATA_CMD_INIT_DEV_PARAMS) {