From: George Kashperko <george@xxxxxxxxxxx>
Modify irqflag routine to reuse tpsflag value rather than
reading TPSFLAG register once again. Change default "not
supported" value from 0x3F to -1.
Signed-off-by: George Kashperko <george@xxxxxxxxxxx>
---
drivers/ssb/driver_mipscore.c | 2 +-
drivers/ssb/ssb_sb.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
--- linux-next-20110203.orig/drivers/ssb/driver_mipscore.c 2011-02-08
16:14:57.000000000 +0200
+++ linux-next-20110203/drivers/ssb/driver_mipscore.c 2011-02-08
16:15:24.000000000 +0200
@@ -75,7 +75,7 @@ unsigned int ssb_mips_irq(struct ssb_dev
unsigned int irq;
irqflag = ssb_irqflag(dev);
- if (irqflag == 0x3f)
+ if (irqflag == -1)
return 6;
ipsflag = ssb_read32(bus->mipscore.dev, SSB_IPSFLAG);
for (irq = 1; irq <= 4; irq++) {
--- linux-next-20110203.orig/drivers/ssb/ssb_sb.c 2011-02-08
16:14:57.000000000 +0200
+++ linux-next-20110203/drivers/ssb/ssb_sb.c 2011-02-08
16:15:24.000000000 +0200
@@ -175,10 +175,10 @@ static u32 ssb_irqflag_sb(struct ssb_dev
{
u32 tpsflag = ssb_read32(dev, SSB_TPSFLAG);
if (tpsflag)
- return ssb_read32(dev, SSB_TPSFLAG) & SSB_TPSFLAG_BPFLAG;
+ return tpsflag & SSB_TPSFLAG_BPFLAG;
else
/* not irq supported */
- return 0x3f;
+ return -1;
}
static void ssb_core_ctl_flags_sb(struct ssb_device *dev, u32 mask,
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
