mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-25 10:19:47 +00:00
[libata] sata_mv: remove extra braces
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
parent
b9099ff63c
commit
351772658a
1 changed files with 7 additions and 12 deletions
|
@ -798,20 +798,18 @@ static u32 mv_scr_read(struct ata_port *ap, unsigned int sc_reg_in)
|
||||||
{
|
{
|
||||||
unsigned int ofs = mv_scr_offset(sc_reg_in);
|
unsigned int ofs = mv_scr_offset(sc_reg_in);
|
||||||
|
|
||||||
if (0xffffffffU != ofs) {
|
if (0xffffffffU != ofs)
|
||||||
return readl(mv_ap_base(ap) + ofs);
|
return readl(mv_ap_base(ap) + ofs);
|
||||||
} else {
|
else
|
||||||
return (u32) ofs;
|
return (u32) ofs;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void mv_scr_write(struct ata_port *ap, unsigned int sc_reg_in, u32 val)
|
static void mv_scr_write(struct ata_port *ap, unsigned int sc_reg_in, u32 val)
|
||||||
{
|
{
|
||||||
unsigned int ofs = mv_scr_offset(sc_reg_in);
|
unsigned int ofs = mv_scr_offset(sc_reg_in);
|
||||||
|
|
||||||
if (0xffffffffU != ofs) {
|
if (0xffffffffU != ofs)
|
||||||
writelfl(val, mv_ap_base(ap) + ofs);
|
writelfl(val, mv_ap_base(ap) + ofs);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void mv_edma_cfg(struct mv_host_priv *hpriv, void __iomem *port_mmio)
|
static void mv_edma_cfg(struct mv_host_priv *hpriv, void __iomem *port_mmio)
|
||||||
|
@ -1320,17 +1318,15 @@ static void mv_host_intr(struct ata_host *host, u32 relevant, unsigned int hc)
|
||||||
int shift, port, port0, hard_port, handled;
|
int shift, port, port0, hard_port, handled;
|
||||||
unsigned int err_mask;
|
unsigned int err_mask;
|
||||||
|
|
||||||
if (hc == 0) {
|
if (hc == 0)
|
||||||
port0 = 0;
|
port0 = 0;
|
||||||
} else {
|
else
|
||||||
port0 = MV_PORTS_PER_HC;
|
port0 = MV_PORTS_PER_HC;
|
||||||
}
|
|
||||||
|
|
||||||
/* we'll need the HC success int register in most cases */
|
/* we'll need the HC success int register in most cases */
|
||||||
hc_irq_cause = readl(hc_mmio + HC_IRQ_CAUSE_OFS);
|
hc_irq_cause = readl(hc_mmio + HC_IRQ_CAUSE_OFS);
|
||||||
if (hc_irq_cause) {
|
if (hc_irq_cause)
|
||||||
writelfl(~hc_irq_cause, hc_mmio + HC_IRQ_CAUSE_OFS);
|
writelfl(~hc_irq_cause, hc_mmio + HC_IRQ_CAUSE_OFS);
|
||||||
}
|
|
||||||
|
|
||||||
VPRINTK("ENTER, hc%u relevant=0x%08x HC IRQ cause=0x%08x\n",
|
VPRINTK("ENTER, hc%u relevant=0x%08x HC IRQ cause=0x%08x\n",
|
||||||
hc,relevant,hc_irq_cause);
|
hc,relevant,hc_irq_cause);
|
||||||
|
@ -1425,9 +1421,8 @@ static irqreturn_t mv_interrupt(int irq, void *dev_instance)
|
||||||
/* check the cases where we either have nothing pending or have read
|
/* check the cases where we either have nothing pending or have read
|
||||||
* a bogus register value which can indicate HW removal or PCI fault
|
* a bogus register value which can indicate HW removal or PCI fault
|
||||||
*/
|
*/
|
||||||
if (!irq_stat || (0xffffffffU == irq_stat)) {
|
if (!irq_stat || (0xffffffffU == irq_stat))
|
||||||
return IRQ_NONE;
|
return IRQ_NONE;
|
||||||
}
|
|
||||||
|
|
||||||
n_hcs = mv_get_hc_count(host->ports[0]->flags);
|
n_hcs = mv_get_hc_count(host->ports[0]->flags);
|
||||||
spin_lock(&host->lock);
|
spin_lock(&host->lock);
|
||||||
|
|
Loading…
Reference in a new issue