|
@@ -854,22 +854,14 @@ static irqreturn_t nv_adma_interrupt(int irq, void *dev_instance)
|
|
|
|
|
|
if (status & (NV_ADMA_STAT_DONE |
|
|
|
NV_ADMA_STAT_CPBERR)) {
|
|
|
+ u32 check_commands = notifier | notifier_error;
|
|
|
+ int pos, error = 0;
|
|
|
/** Check CPBs for completed commands */
|
|
|
-
|
|
|
- if (ata_tag_valid(ap->active_tag)) {
|
|
|
- /* Non-NCQ command */
|
|
|
- nv_adma_check_cpb(ap, ap->active_tag,
|
|
|
- notifier_error & (1 << ap->active_tag));
|
|
|
- } else {
|
|
|
- int pos, error = 0;
|
|
|
- u32 active = ap->sactive;
|
|
|
-
|
|
|
- while ((pos = ffs(active)) && !error) {
|
|
|
- pos--;
|
|
|
- error = nv_adma_check_cpb(ap, pos,
|
|
|
- notifier_error & (1 << pos) );
|
|
|
- active &= ~(1 << pos );
|
|
|
- }
|
|
|
+ while ((pos = ffs(check_commands)) && !error) {
|
|
|
+ pos--;
|
|
|
+ error = nv_adma_check_cpb(ap, pos,
|
|
|
+ notifier_error & (1 << pos) );
|
|
|
+ check_commands &= ~(1 << pos );
|
|
|
}
|
|
|
}
|
|
|
}
|