KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

oxnas: sata_oxnas: make irq handler more readable

Browse source 
safed one level of indention by using 'continue' instead of a
lengthy if-clause.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
v2: use logic-AND instead of '?' operator when checking for hw bug 6320

SVN-Revision: 43768
This commit is contained in:
Felix Fietkau 2014-12-22 20:47:10 +00:00
parent 74a9e1c1b0
commit 93192e65e8
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
target/linux/oxnas/files/drivers/ata/sata_oxnas.c
View file

@ -2041,7 +2041,7 @@ int sata_oxnas_init_controller(struct ata_host *host)
* *
* @param port SATA port to check and if necessary, correct. * @param port SATA port to check and if necessary, correct.
*/ */
static int sata_oxnas_bug_6320_workaround(struct ata_port *ap) static int sata_oxnas_bug_6320_detect(struct ata_port *ap)
{ {
struct sata_oxnas_port_priv *pd = ap->private_data; struct sata_oxnas_port_priv *pd = ap->private_data;
void __iomem *core_base = pd->core_base; void __iomem *core_base = pd->core_base;
@ -2175,19 +2175,20 @@ static irqreturn_t sata_oxnas_interrupt(int irq, void *dev_instance)
/* check the raw end of command interrupt to see if the /* check the raw end of command interrupt to see if the
* port is done */ * port is done */
mask = (COREINT_END << port_no); mask = (COREINT_END << port_no);
if (int_status & mask) { if (!(int_status & mask))
continue;
/* this port had an interrupt, clear it */ /* this port had an interrupt, clear it */
iowrite32(mask, core_base + CORE_INT_CLEAR); iowrite32(mask, core_base + CORE_INT_CLEAR);
bug_present = /* check for bug 6320 only if no microcode was loaded */
(hd->current_ucode == UNKNOWN_MODE) ? bug_present = (hd->current_ucode == UNKNOWN_MODE) &&
sata_oxnas_bug_6320_workaround( sata_oxnas_bug_6320_detect(ah->ports[port_no]);
ah->ports[port_no]):0;
sata_oxnas_port_irq(ah->ports[port_no], sata_oxnas_port_irq(ah->ports[port_no],
bug_present); bug_present);
ret = IRQ_HANDLED; ret = IRQ_HANDLED;
} }
} }
}
return ret; return ret;
} }