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

Commit 3c619ffd authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: remove no longer needed ide_drive_t fields 



Remove ->remap_0_to_1 and ->sect0 (they are always zero now).

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

drivers/ide/ide-disk.c

+1 −1
Original line number Diff line number Diff line
@@ -472,7 +472,7 @@ static void init_idedisk_capacity(ide_drive_t *drive) 


static sector_t idedisk_capacity(ide_drive_t *drive)

{

	return drive->capacity64 - drive->sect0;

	return drive->capacity64;

}



#ifdef CONFIG_IDE_PROC_FS

drivers/ide/ide-io.c

+3 −15
Original line number Diff line number Diff line
@@ -765,9 +765,7 @@ static void ide_check_pm_state(ide_drive_t *drive, struct request *rq) 
 *	start_request	-	start of I/O and command issuing for IDE

 *

 *	start_request() initiates handling of a new I/O request. It

 *	accepts commands and I/O (read/write) requests. It also does

 *	the final remapping for weird stuff like EZDrive. Once 

 *	device mapper can work sector level the EZDrive stuff can go away

 *	accepts commands and I/O (read/write) requests.

 *

 *	FIXME: this function needs a rename

 */
@@ -775,7 +773,6 @@ static void ide_check_pm_state(ide_drive_t *drive, struct request *rq) 
static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq)

{

	ide_startstop_t startstop;

	sector_t block;



	BUG_ON(!blk_rq_started(rq));
@@ -790,16 +787,6 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq) 
		goto kill_rq;

	}



	block    = rq->sector;

	if (blk_fs_request(rq) &&

	    (drive->media == ide_disk || drive->media == ide_floppy)) {

		block += drive->sect0;

	}

	/* Yecch - this will shift the entire interval,

	   possibly killing some innocent following sector */

	if (block == 0 && drive->remap_0_to_1 == 1)

		block = 1;  /* redirect MBR access to EZ-Drive partn table */



	if (blk_pm_request(rq))

		ide_check_pm_state(drive, rq);
@@ -844,7 +831,8 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq) 
			return ide_special_rq(drive, rq);



		drv = *(ide_driver_t **)rq->rq_disk->private_data;

		return drv->do_request(drive, rq, block);



		return drv->do_request(drive, rq, rq->sector);

	}

	return do_special(drive);

kill_rq:

include/linux/ide.h

+0 −2
Original line number Diff line number Diff line
@@ -418,7 +418,6 @@ struct ide_drive_s { 
	unsigned atapi_overlap	: 1;	/* ATAPI overlap (not supported) */

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

	unsigned nodma		: 1;	/* disallow DMA */

	unsigned remap_0_to_1	: 1;	/* 0=noremap, 1=remap 0->1 (for EZDrive) */

	unsigned blocked        : 1;	/* 1=powermanagment told us not to do anything, so sleep nicely */

	unsigned scsi		: 1;	/* 0=default, 1=ide-scsi emulation */

	unsigned sleeping	: 1;	/* 1=sleeping & sleep field valid */
@@ -441,7 +440,6 @@ struct ide_drive_s { 
	u8	io_32bit;	/* 0=16-bit, 1=32-bit, 2/3=32bit+sync */

	u8	bad_wstat;	/* used for ignoring ATA_DF */

	u8	nowerr;		/* used for ignoring ATA_DF */

	u8	sect0;		/* offset of first sector for DM6:DDO */

	u8	head;		/* "real" number of heads */

	u8	sect;		/* "real" sectors per track */

	u8	bios_head;	/* BIOS/fdisk/LILO number of heads */