Re: [-mm patch] remove ide_get_error_location()

Bartlomiej Zolnierkiewicz
2007-09-11T21:41:23Z

On Sunday 09 September 2007, Adrian Bunk wrote:
> On Fri, Aug 31, 2007 at 09:58:22PM -0700, Andrew Morton wrote:
> >...
> > Changes since 2.6.23-rc3-mm1:
> >...
> > git-block.patch
> >...
> > git trees
> >...
>
> ide_get_error_location() is no longer used.
>
> Signed-off-by: Adrian Bunk <bunk@kernel.org>

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Since git-block contains the patch which removes the only user of
ide_get_error_location() I think that this patch should be also merged
through block tree. Jens?

PS none of the blkdev_issue_flush() users uses *error_sector argument
so it can be probably removed as well

> ---
>
> drivers/ide/ide-io.c | 35 -----------------------------------
> include/linux/ide.h | 5 -----
> 2 files changed, 40 deletions(-)
>
> 924249789a0c0d577c5c5bfa91f4e514b7ebde60
> diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
> index c1692d9..ec835e3 100644
> --- a/drivers/ide/ide-io.c
> +++ b/drivers/ide/ide-io.c
> @@ -322,41 +322,6 @@ static void ide_complete_pm_request (ide_drive_t *drive, struct request *rq)
> spin_unlock_irqrestore(&ide_lock, flags);
> }
>
> -/*
> - * FIXME: probably move this somewhere else, name is bad too :)
> - */
> -u64 ide_get_error_location(ide_drive_t *drive, char *args)
> -{
> - u32 high, low;
> - u8 hcyl, lcyl, sect;
> - u64 sector;
> -
> - high = 0;
> - hcyl = args[5];
> - lcyl = args[4];
> - sect = args[3];
> -
> - if (ide_id_has_flush_cache_ext(drive->id)) {
> - low = (hcyl << 16) | (lcyl << 8) | sect;
> - HWIF(drive)->OUTB(drive->ctl|0x80, IDE_CONTROL_REG);
> - high = ide_read_24(drive);
> - } else {
> - u8 cur = HWIF(drive)->INB(IDE_SELECT_REG);
> - if (cur & 0x40) {
> - high = cur & 0xf;
> - low = (hcyl << 16) | (lcyl << 8) | sect;
> - } else {
> - low = hcyl * drive->head * drive->sect;
> - low += lcyl * drive->sect;
> - low += sect - 1;
> - }
> - }
> -
> - sector = ((u64) high << 24) | low;
> - return sector;
> -}
> -EXPORT_SYMBOL(ide_get_error_location);
> -
> /**
> * ide_end_drive_cmd - end an explicit drive command
> * @drive: command
> diff --git a/include/linux/ide.h b/include/linux/ide.h
> index 48871f9..65de5c3 100644
> --- a/include/linux/ide.h
> +++ b/include/linux/ide.h
> @@ -1088,11 +1088,6 @@ extern ide_startstop_t ide_do_reset (ide_drive_t *);
> extern void ide_init_drive_cmd (struct request *rq);
>
> /*
> - * this function returns error location sector offset in case of a write error
> - */
> -extern u64 ide_get_error_location(ide_drive_t *, char *);
> -
> -/*
> * "action" parameter type for ide_do_drive_cmd() below.
> */
> typedef enum {
>
>