aboutsummaryrefslogtreecommitdiffstats
path: root/package/switch
diff options
context:
space:
mode:
authorMichael Büsch <mb@bu3sch.de>2008-02-19 15:22:17 +0000
committerMichael Büsch <mb@bu3sch.de>2008-02-19 15:22:17 +0000
commitfaa14263f5f9617a91b4d8335f93814522c8d42b (patch)
tree0040ee1106476424deb370b40f21b482d878874a /package/switch
parent66dec6d8a159cfc189f7ee635c13d9b99636f1ce (diff)
downloadupstream-faa14263f5f9617a91b4d8335f93814522c8d42b.tar.gz
upstream-faa14263f5f9617a91b4d8335f93814522c8d42b.tar.bz2
upstream-faa14263f5f9617a91b4d8335f93814522c8d42b.zip
ssb: Make the GPIO API reentrancy safe.
SVN-Revision: 10496
Diffstat (limited to 'package/switch')
-rw-r--r--package/switch/src/gpio-bcm947xx.h29
1 files changed, 7 insertions, 22 deletions
diff --git a/package/switch/src/gpio-bcm947xx.h b/package/switch/src/gpio-bcm947xx.h
index 384ea3ea18..9417bce2a1 100644
--- a/package/switch/src/gpio-bcm947xx.h
+++ b/package/switch/src/gpio-bcm947xx.h
@@ -3,54 +3,39 @@
#include <linux/interrupt.h>
#ifndef BCMDRIVER
-#include <linux/ssb/ssb.h>
-#include <linux/ssb/ssb_driver_chipcommon.h>
-#include <linux/ssb/ssb_driver_extif.h>
+#include <linux/ssb/ssb_embedded.h>
extern struct ssb_bus ssb;
-#define gpio_op(op, param...) \
- do { \
- if (ssb.chipco.dev) \
- return ssb_chipco_gpio_##op(&ssb.chipco, param); \
- else if (ssb.extif.dev) \
- return ssb_extif_gpio_##op(&ssb.extif, param); \
- else \
- return 0; \
- } while (0);
-
static inline u32 gpio_in(void)
{
- gpio_op(in, ~0);
+ return ssb_gpio_in(&ssb, ~0);
}
static inline u32 gpio_out(u32 mask, u32 value)
{
- gpio_op(out, mask, value);
+ return ssb_gpio_out(&ssb, mask, value);
}
static inline u32 gpio_outen(u32 mask, u32 value)
{
- gpio_op(outen, mask, value);
+ return ssb_gpio_outen(&ssb, mask, value);
}
static inline u32 gpio_control(u32 mask, u32 value)
{
- if (ssb.chipco.dev)
- return ssb_chipco_gpio_control(&ssb.chipco, mask, value);
- else
- return 0;
+ return ssb_gpio_control(&ssb, mask, value);
}
static inline u32 gpio_intmask(u32 mask, u32 value)
{
- gpio_op(intmask, mask, value);
+ return ssb_gpio_intmask(&ssb, mask, value);
}
static inline u32 gpio_intpolarity(u32 mask, u32 value)
{
- gpio_op(polarity, mask, value);
+ return ssb_gpio_polarity(&ssb, mask, value);
}
#else