aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/ide/ide-cd.c1
-rw-r--r--drivers/ide/ide-disk.c1
-rw-r--r--drivers/ide/ide-floppy.c1
-rw-r--r--drivers/ide/ide-tape.c1
-rw-r--r--drivers/scsi/ide-scsi.c1
-rw-r--r--include/linux/ide.h1
6 files changed, 0 insertions, 6 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index ea7cd4e0b157..84bc2413312a 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -1966,7 +1966,6 @@ static ide_driver_t ide_cdrom_driver = {
1966 .probe = ide_cd_probe, 1966 .probe = ide_cd_probe,
1967 .remove = ide_cd_remove, 1967 .remove = ide_cd_remove,
1968 .version = IDECD_VERSION, 1968 .version = IDECD_VERSION,
1969 .media = ide_cdrom,
1970 .do_request = ide_cd_do_request, 1969 .do_request = ide_cd_do_request,
1971 .end_request = ide_end_request, 1970 .end_request = ide_end_request,
1972 .error = __ide_error, 1971 .error = __ide_error,
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 7ee2c9d2e5c2..c35de54dfc22 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -938,7 +938,6 @@ static ide_driver_t idedisk_driver = {
938 .resume = ide_disk_resume, 938 .resume = ide_disk_resume,
939 .shutdown = ide_device_shutdown, 939 .shutdown = ide_device_shutdown,
940 .version = IDEDISK_VERSION, 940 .version = IDEDISK_VERSION,
941 .media = ide_disk,
942 .do_request = ide_do_rw_disk, 941 .do_request = ide_do_rw_disk,
943 .end_request = ide_end_request, 942 .end_request = ide_end_request,
944 .error = __ide_error, 943 .error = __ide_error,
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index cdfadb01d07f..8c2b00941bd8 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -673,7 +673,6 @@ static ide_driver_t idefloppy_driver = {
673 .probe = ide_floppy_probe, 673 .probe = ide_floppy_probe,
674 .remove = ide_floppy_remove, 674 .remove = ide_floppy_remove,
675 .version = IDEFLOPPY_VERSION, 675 .version = IDEFLOPPY_VERSION,
676 .media = ide_floppy,
677 .do_request = idefloppy_do_request, 676 .do_request = idefloppy_do_request,
678 .end_request = idefloppy_end_request, 677 .end_request = idefloppy_end_request,
679 .error = __ide_error, 678 .error = __ide_error,
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 103f9f161716..27665e3a41cb 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -2318,7 +2318,6 @@ static ide_driver_t idetape_driver = {
2318 .probe = ide_tape_probe, 2318 .probe = ide_tape_probe,
2319 .remove = ide_tape_remove, 2319 .remove = ide_tape_remove,
2320 .version = IDETAPE_VERSION, 2320 .version = IDETAPE_VERSION,
2321 .media = ide_tape,
2322 .do_request = idetape_do_request, 2321 .do_request = idetape_do_request,
2323 .end_request = idetape_end_request, 2322 .end_request = idetape_end_request,
2324 .error = __ide_error, 2323 .error = __ide_error,
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index 67e9ed95f669..c2995972052c 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -437,7 +437,6 @@ static ide_driver_t idescsi_driver = {
437 .probe = ide_scsi_probe, 437 .probe = ide_scsi_probe,
438 .remove = ide_scsi_remove, 438 .remove = ide_scsi_remove,
439 .version = IDESCSI_VERSION, 439 .version = IDESCSI_VERSION,
440 .media = ide_scsi,
441 .do_request = idescsi_do_request, 440 .do_request = idescsi_do_request,
442 .end_request = idescsi_end_request, 441 .end_request = idescsi_end_request,
443 .error = idescsi_atapi_error, 442 .error = idescsi_atapi_error,
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 230bd9dd851d..7fd1ec135510 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1029,7 +1029,6 @@ enum {
1029 */ 1029 */
1030struct ide_driver_s { 1030struct ide_driver_s {
1031 const char *version; 1031 const char *version;
1032 u8 media;
1033 ide_startstop_t (*do_request)(ide_drive_t *, struct request *, sector_t); 1032 ide_startstop_t (*do_request)(ide_drive_t *, struct request *, sector_t);
1034 int (*end_request)(ide_drive_t *, int, int); 1033 int (*end_request)(ide_drive_t *, int, int);
1035 ide_startstop_t (*error)(ide_drive_t *, struct request *rq, u8, u8); 1034 ide_startstop_t (*error)(ide_drive_t *, struct request *rq, u8, u8);