aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorBorislav Petkov <petkovbb@googlemail.com>2008-04-17 18:46:27 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-04-17 18:46:27 -0400
commitc2b2b29361dde5f1d9169a487c3021b14cf36518 (patch)
tree2e0a11fe4b5a96fcb210d2a987a7df11b5a3dec9 /drivers/ide
parent1c065787c0359fc3b438c1c0aa2fcfd514fef07a (diff)
ide-floppy: rename end_request handler properly
mv idefloppy_do_end_request -> idefloppy_end_request as is the case with ide-cd Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/ide-floppy.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 7e62dfc186f6..bf1ef60a5a07 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -213,7 +213,7 @@ static void ide_floppy_put(struct ide_floppy_obj *floppy)
213 * Used to finish servicing a request. For read/write requests, we will call 213 * Used to finish servicing a request. For read/write requests, we will call
214 * ide_end_request to pass to the next buffer. 214 * ide_end_request to pass to the next buffer.
215 */ 215 */
216static int idefloppy_do_end_request(ide_drive_t *drive, int uptodate, int nsecs) 216static int idefloppy_end_request(ide_drive_t *drive, int uptodate, int nsecs)
217{ 217{
218 idefloppy_floppy_t *floppy = drive->driver_data; 218 idefloppy_floppy_t *floppy = drive->driver_data;
219 struct request *rq = HWGROUP(drive)->rq; 219 struct request *rq = HWGROUP(drive)->rq;
@@ -270,7 +270,7 @@ static void ide_floppy_io_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc,
270 done += count; 270 done += count;
271 } 271 }
272 272
273 idefloppy_do_end_request(drive, 1, done >> 9); 273 idefloppy_end_request(drive, 1, done >> 9);
274 274
275 if (bcount) { 275 if (bcount) {
276 printk(KERN_ERR "%s: leftover data in %s, bcount == %d\n", 276 printk(KERN_ERR "%s: leftover data in %s, bcount == %d\n",
@@ -289,7 +289,7 @@ static void idefloppy_update_buffers(ide_drive_t *drive,
289 struct bio *bio = rq->bio; 289 struct bio *bio = rq->bio;
290 290
291 while ((bio = rq->bio) != NULL) 291 while ((bio = rq->bio) != NULL)
292 idefloppy_do_end_request(drive, 1, 0); 292 idefloppy_end_request(drive, 1, 0);
293} 293}
294 294
295/* 295/*
@@ -355,11 +355,11 @@ static void idefloppy_request_sense_callback(ide_drive_t *drive)
355 floppy->ascq); 355 floppy->ascq);
356 356
357 357
358 idefloppy_do_end_request(drive, 1, 0); 358 idefloppy_end_request(drive, 1, 0);
359 } else { 359 } else {
360 printk(KERN_ERR "Error in REQUEST SENSE itself - Aborting" 360 printk(KERN_ERR "Error in REQUEST SENSE itself - Aborting"
361 " request!\n"); 361 " request!\n");
362 idefloppy_do_end_request(drive, 0, 0); 362 idefloppy_end_request(drive, 0, 0);
363 } 363 }
364} 364}
365 365
@@ -370,7 +370,7 @@ static void idefloppy_pc_callback(ide_drive_t *drive)
370 370
371 debug_log("Reached %s\n", __func__); 371 debug_log("Reached %s\n", __func__);
372 372
373 idefloppy_do_end_request(drive, floppy->pc->error ? 0 : 1, 0); 373 idefloppy_end_request(drive, floppy->pc->error ? 0 : 1, 0);
374} 374}
375 375
376static void idefloppy_init_pc(struct ide_atapi_pc *pc) 376static void idefloppy_init_pc(struct ide_atapi_pc *pc)
@@ -715,7 +715,7 @@ static void idefloppy_rw_callback(ide_drive_t *drive)
715{ 715{
716 debug_log("Reached %s\n", __func__); 716 debug_log("Reached %s\n", __func__);
717 717
718 idefloppy_do_end_request(drive, 1, 0); 718 idefloppy_end_request(drive, 1, 0);
719 return; 719 return;
720} 720}
721 721
@@ -863,7 +863,7 @@ static ide_startstop_t idefloppy_do_request(ide_drive_t *drive,
863 else 863 else
864 printk(KERN_ERR "ide-floppy: %s: I/O error\n", 864 printk(KERN_ERR "ide-floppy: %s: I/O error\n",
865 drive->name); 865 drive->name);
866 idefloppy_do_end_request(drive, 0, 0); 866 idefloppy_end_request(drive, 0, 0);
867 return ide_stopped; 867 return ide_stopped;
868 } 868 }
869 if (blk_fs_request(rq)) { 869 if (blk_fs_request(rq)) {
@@ -871,7 +871,7 @@ static ide_startstop_t idefloppy_do_request(ide_drive_t *drive,
871 (rq->nr_sectors % floppy->bs_factor)) { 871 (rq->nr_sectors % floppy->bs_factor)) {
872 printk(KERN_ERR "%s: unsupported r/w request size\n", 872 printk(KERN_ERR "%s: unsupported r/w request size\n",
873 drive->name); 873 drive->name);
874 idefloppy_do_end_request(drive, 0, 0); 874 idefloppy_end_request(drive, 0, 0);
875 return ide_stopped; 875 return ide_stopped;
876 } 876 }
877 pc = idefloppy_next_pc_storage(drive); 877 pc = idefloppy_next_pc_storage(drive);
@@ -884,7 +884,7 @@ static ide_startstop_t idefloppy_do_request(ide_drive_t *drive,
884 } else { 884 } else {
885 blk_dump_rq_flags(rq, 885 blk_dump_rq_flags(rq,
886 "ide-floppy: unsupported command in queue"); 886 "ide-floppy: unsupported command in queue");
887 idefloppy_do_end_request(drive, 0, 0); 887 idefloppy_end_request(drive, 0, 0);
888 return ide_stopped; 888 return ide_stopped;
889 } 889 }
890 890
@@ -1359,7 +1359,7 @@ static ide_driver_t idefloppy_driver = {
1359 .media = ide_floppy, 1359 .media = ide_floppy,
1360 .supports_dsc_overlap = 0, 1360 .supports_dsc_overlap = 0,
1361 .do_request = idefloppy_do_request, 1361 .do_request = idefloppy_do_request,
1362 .end_request = idefloppy_do_end_request, 1362 .end_request = idefloppy_end_request,
1363 .error = __ide_error, 1363 .error = __ide_error,
1364 .abort = __ide_abort, 1364 .abort = __ide_abort,
1365#ifdef CONFIG_IDE_PROC_FS 1365#ifdef CONFIG_IDE_PROC_FS