diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@trik.(none)> | 2005-01-07 05:19:40 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@trik.(none)> | 2005-01-07 05:19:40 +0100 |
| commit | ea46e05ab5eddaea64fa89e62a1367eb11893bb9 (patch) | |
| tree | bcc0b4f38f14fe2a380e47f3a187f78275c87083 | |
| parent | e04fb1300cc3576e7c52c2785f2bf84d4f7718d1 (diff) | |
[ide] kill write-only ide_driver_t->sense
also kill default_sense() in ide.c
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
| -rw-r--r-- | drivers/ide/ide-cd.c | 1 | ||||
| -rw-r--r-- | drivers/ide/ide-disk.c | 1 | ||||
| -rw-r--r-- | drivers/ide/ide.c | 6 | ||||
| -rw-r--r-- | include/linux/ide.h | 1 |
4 files changed, 0 insertions, 9 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 2dae7b293314..b16e88c8dbf1 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c @@ -3369,7 +3369,6 @@ static ide_driver_t ide_cdrom_driver = { .supports_dsc_overlap = 1, .cleanup = ide_cdrom_cleanup, .do_request = ide_do_rw_cdrom, - .sense = ide_dump_atapi_status, .error = ide_cdrom_error, .abort = ide_cdrom_abort, .capacity = ide_cdrom_capacity, diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c index 44a49da84069..7412833b6dce 100644 --- a/drivers/ide/ide-disk.c +++ b/drivers/ide/ide-disk.c @@ -1358,7 +1358,6 @@ static ide_driver_t idedisk_driver = { .supports_dsc_overlap = 0, .cleanup = idedisk_cleanup, .do_request = ide_do_rw_disk, - .sense = idedisk_dump_status, .error = idedisk_error, .abort = idedisk_abort, .pre_reset = idedisk_pre_reset, diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index 12509b6cabc6..cfc430cface3 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c @@ -2180,11 +2180,6 @@ static int default_end_request (ide_drive_t *drive, int uptodate, int nr_sects) return ide_end_request(drive, uptodate, nr_sects); } -static u8 default_sense (ide_drive_t *drive, const char *msg, u8 stat) -{ - return ide_dump_status(drive, msg, stat); -} - static ide_startstop_t default_error (ide_drive_t *drive, const char *msg, u8 stat) { return ide_error(drive, msg, stat); @@ -2233,7 +2228,6 @@ static void setup_driver_defaults (ide_driver_t *d) if (d->cleanup == NULL) d->cleanup = default_cleanup; if (d->do_request == NULL) d->do_request = default_do_request; if (d->end_request == NULL) d->end_request = default_end_request; - if (d->sense == NULL) d->sense = default_sense; if (d->error == NULL) d->error = default_error; if (d->abort == NULL) d->abort = default_abort; if (d->pre_reset == NULL) d->pre_reset = default_pre_reset; diff --git a/include/linux/ide.h b/include/linux/ide.h index f11d04d235f2..a03aa83488dd 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -1097,7 +1097,6 @@ typedef struct ide_driver_s { int (*cleanup)(ide_drive_t *); ide_startstop_t (*do_request)(ide_drive_t *, struct request *, sector_t); int (*end_request)(ide_drive_t *, int, int); - u8 (*sense)(ide_drive_t *, const char *, u8); ide_startstop_t (*error)(ide_drive_t *, const char *, u8); ide_startstop_t (*abort)(ide_drive_t *, const char *); int (*ioctl)(ide_drive_t *, struct inode *, struct file *, unsigned int, unsigned long); |
