Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 372254
b: refs/heads/master
c: 862d309
h: refs/heads/master
v: v3
  • Loading branch information
Magnus Damm authored and Simon Horman committed Mar 18, 2013
1 parent a85d94c commit 68dc129
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8e56e6d5bfad8d07befe1026e49ff0046ef0b147
refs/heads/master: 862d309883c69d67e1a2095e6f9e8ef35bf72dd6
8 changes: 5 additions & 3 deletions trunk/drivers/irqchip/irq-renesas-intc-irqpin.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@ struct intc_irqpin_iomem {
unsigned long (*read)(void __iomem *iomem);
void (*write)(void __iomem *iomem, unsigned long data);
int width;
};
};

struct intc_irqpin_irq {
int hw_irq;
int irq;
struct intc_irqpin_priv *p;
};
};

struct intc_irqpin_priv {
struct intc_irqpin_iomem iomem[INTC_IRQPIN_REG_NR];
Expand Down Expand Up @@ -99,13 +99,15 @@ static inline unsigned long intc_irqpin_read(struct intc_irqpin_priv *p,
int reg)
{
struct intc_irqpin_iomem *i = &p->iomem[reg];

return i->read(i->iomem);
}

static inline void intc_irqpin_write(struct intc_irqpin_priv *p,
int reg, unsigned long data)
{
struct intc_irqpin_iomem *i = &p->iomem[reg];

i->write(i->iomem, data);
}

Expand Down Expand Up @@ -405,7 +407,7 @@ static int intc_irqpin_probe(struct platform_device *pdev)
dev_warn(&pdev->dev, "irq base mismatch (%d/%d)\n",
p->config.irq_base, k);
}

return 0;

err3:
Expand Down

0 comments on commit 68dc129

Please sign in to comment.