d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the style of ata_interrupt_locked().

Browse Source
This commit is contained in:
Rui Paulo 2014-04-12 23:40:54 +00:00
parent 4bc38a5ab0
commit 48e3689098
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sys/dev/ata/ata-all.c
View File

@ -360,24 +360,23 @@ ata_interrupt(void *data)
static void
ata_interrupt_locked(void *data)
{
struct ata_channel *ch = (struct ata_channel *)data;
struct ata_request *request;
struct ata_channel *ch = (struct ata_channel *)data;
struct ata_request *request;
do {
/* ignore interrupt if its not for us */
if (ch->hw.status && !ch->hw.status(ch->dev))
break;
return;
/* do we have a running request */
if (!(request = ch->running))
break;
return;
ATA_DEBUG_RQ(request, "interrupt");
/* safetycheck for the right state */
if (ch->state == ATA_IDLE) {
device_printf(request->dev, "interrupt on idle channel ignored\n");
break;
device_printf(request->dev, "interrupt on idle channel ignored\n");
return;
}
/*
@ -385,13 +384,12 @@ ata_interrupt_locked(void *data)
* if it finishes immediately otherwise wait for next interrupt
*/
if (ch->hw.end_transaction(request) == ATA_OP_FINISHED) {
ch->running = NULL;
if (ch->state == ATA_ACTIVE)
ch->state = ATA_IDLE;
ata_cam_end_transaction(ch->dev, request);
return;
ch->running = NULL;
if (ch->state == ATA_ACTIVE)
ch->state = ATA_IDLE;
ata_cam_end_transaction(ch->dev, request);
return;
}
} while (0);
}
static void