Commit 627e05da authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: remove ->error method from struct ide_driver 



* Remove (now superfluous) ->error method from struct ide_driver.

* Unexport __ide_error() and make it static.

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

drivers/ide/ide-cd.c

+0 −1
Original line number Diff line number Diff line
@@ -1925,7 +1925,6 @@ static struct ide_driver ide_cdrom_driver = { 
	.version		= IDECD_VERSION,

	.do_request		= ide_cd_do_request,

	.end_request		= ide_end_request,

	.error			= __ide_error,

#ifdef CONFIG_IDE_PROC_FS

	.proc_entries		= ide_cd_proc_entries,

	.proc_devsets		= ide_cd_proc_devsets,

drivers/ide/ide-gd.c

+0 −1
Original line number Diff line number Diff line
@@ -162,7 +162,6 @@ static struct ide_driver ide_gd_driver = { 
	.version		= IDE_GD_VERSION,

	.do_request		= ide_gd_do_request,

	.end_request		= ide_gd_end_request,

	.error			= __ide_error,

#ifdef CONFIG_IDE_PROC_FS

	.proc_entries		= ide_disk_proc_entries,

	.proc_devsets		= ide_disk_proc_devsets,

drivers/ide/ide-io.c

+2 −11
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ static ide_startstop_t ide_atapi_error(ide_drive_t *drive, struct request *rq, u 
	return ide_stopped;

}



ide_startstop_t

static ide_startstop_t

__ide_error(ide_drive_t *drive, struct request *rq, u8 stat, u8 err)

{

	if (drive->media == ide_disk)
@@ -299,8 +299,6 @@ __ide_error(ide_drive_t *drive, struct request *rq, u8 stat, u8 err) 
	return ide_atapi_error(drive, rq, stat, err);

}



EXPORT_SYMBOL_GPL(__ide_error);



/**

 *	ide_error	-	handle an error on the IDE

 *	@drive: drive the error occurred on
@@ -332,15 +330,8 @@ ide_startstop_t ide_error (ide_drive_t *drive, const char *msg, u8 stat) 
		return ide_stopped;

	}



	if (rq->rq_disk) {

		struct ide_driver *drv;



		drv = *(struct ide_driver **)rq->rq_disk->private_data;

		return drv->error(drive, rq, stat, err);

	} else

	return __ide_error(drive, rq, stat, err);

}



EXPORT_SYMBOL_GPL(ide_error);



static void ide_tf_set_specify_cmd(ide_drive_t *drive, struct ide_taskfile *tf)

drivers/ide/ide-tape.c

+0 −1
Original line number Diff line number Diff line
@@ -2324,7 +2324,6 @@ static struct ide_driver idetape_driver = { 
	.version		= IDETAPE_VERSION,

	.do_request		= idetape_do_request,

	.end_request		= idetape_end_request,

	.error			= __ide_error,

#ifdef CONFIG_IDE_PROC_FS

	.proc_entries		= ide_tape_proc_entries,

	.proc_devsets		= ide_tape_proc_devsets,

include/linux/ide.h

+0 −3
Original line number Diff line number Diff line
@@ -1113,7 +1113,6 @@ struct ide_driver { 
	const char			*version;

	ide_startstop_t	(*do_request)(ide_drive_t *, struct request *, sector_t);

	int		(*end_request)(ide_drive_t *, int, int);

	ide_startstop_t	(*error)(ide_drive_t *, struct request *rq, u8, u8);

	struct device_driver	gen_driver;

	int		(*probe)(ide_drive_t *);

	void		(*remove)(ide_drive_t *);
@@ -1157,8 +1156,6 @@ void ide_execute_pkt_cmd(ide_drive_t *); 


void ide_pad_transfer(ide_drive_t *, int, int);



ide_startstop_t __ide_error(ide_drive_t *, struct request *, u8, u8);



ide_startstop_t ide_error(ide_drive_t *, const char *, u8);



void ide_fix_driveid(u16 *);