lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ide: return request status from ->pc_callback method

Browse Source 
Make ->pc_callback method return request status and then move
the request completion from ->pc_callback to ide_pc_intr().

There should be no functional changes caused by this patch.

Acked-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz
2009-03-27 12:46:36 +01:00
parent 3ee38302ff
commit 03a2faaea8
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/ide/ide-atapi.c
View File

@@ -357,6 +357,8 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
/* No more interrupts */ /* No more interrupts */
if ((stat & ATA_DRQ) == 0) { if ((stat & ATA_DRQ) == 0) {
int uptodate;
debug_log("Packet command completed, %d bytes transferred\n", debug_log("Packet command completed, %d bytes transferred\n",
pc->xferred); pc->xferred);
@@ -395,7 +397,15 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
dsc = 1; dsc = 1;
/* Command finished - Call the callback function */ /* Command finished - Call the callback function */
drive->pc_callback(drive, dsc); uptodate = drive->pc_callback(drive, dsc);
if (uptodate == 0)
drive->failed_pc = NULL;
if (blk_special_request(rq))
ide_complete_rq(drive, 0);
else
ide_end_request(drive, uptodate, 0);
return ide_stopped; return ide_stopped;
} }

12
drivers/ide/ide-floppy.c
View File

@@ -71,7 +71,7 @@ static void idefloppy_update_buffers(ide_drive_t *drive,
ide_end_request(drive, 1, 0); ide_end_request(drive, 1, 0);
} }
static void ide_floppy_callback(ide_drive_t *drive, int dsc) static int ide_floppy_callback(ide_drive_t *drive, int dsc)
{ {
struct ide_disk_obj *floppy = drive->driver_data; struct ide_disk_obj *floppy = drive->driver_data;
struct ide_atapi_pc *pc = drive->pc; struct ide_atapi_pc *pc = drive->pc;
@@ -108,14 +108,10 @@ static void ide_floppy_callback(ide_drive_t *drive, int dsc)
"Aborting request!\n"); "Aborting request!\n");
} }
if (uptodate == 0) if (blk_special_request(rq))
drive->failed_pc = NULL;
if (blk_special_request(rq)) {
rq->errors = uptodate ? 0 : IDE_DRV_ERROR_GENERAL; rq->errors = uptodate ? 0 : IDE_DRV_ERROR_GENERAL;
ide_complete_rq(drive, 0);
} else return uptodate;
ide_end_request(drive, uptodate, 0);
} }
static void ide_floppy_report_error(struct ide_disk_obj *floppy, static void ide_floppy_report_error(struct ide_disk_obj *floppy,

10
drivers/ide/ide-tape.c
View File

@@ -463,7 +463,7 @@ static void ide_tape_kfree_buffer(idetape_tape_t *tape)
static void ide_tape_handle_dsc(ide_drive_t *); static void ide_tape_handle_dsc(ide_drive_t *);
static void ide_tape_callback(ide_drive_t *drive, int dsc) static int ide_tape_callback(ide_drive_t *drive, int dsc)
{ {
idetape_tape_t *tape = drive->driver_data; idetape_tape_t *tape = drive->driver_data;
struct ide_atapi_pc *pc = drive->pc; struct ide_atapi_pc *pc = drive->pc;
@@ -530,13 +530,7 @@ static void ide_tape_callback(ide_drive_t *drive, int dsc)
rq->errors = err; rq->errors = err;
if (uptodate == 0) return uptodate;
drive->failed_pc = NULL;
if (blk_special_request(rq))
ide_complete_rq(drive, 0);
else
ide_end_request(drive, uptodate, 0);
} }
/* /*

2
include/linux/ide.h
View File

@@ -619,7 +619,7 @@ struct ide_drive_s {
struct ide_atapi_pc *failed_pc; struct ide_atapi_pc *failed_pc;
/* callback for packet commands */ /* callback for packet commands */
void (*pc_callback)(struct ide_drive_s *, int); int (*pc_callback)(struct ide_drive_s *, int);
void (*pc_update_buffers)(struct ide_drive_s *, struct ide_atapi_pc *); void (*pc_update_buffers)(struct ide_drive_s *, struct ide_atapi_pc *);
int (*pc_io_buffers)(struct ide_drive_s *, struct ide_atapi_pc *, int (*pc_io_buffers)(struct ide_drive_s *, struct ide_atapi_pc *,