diff options
author | mb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-02-19 15:22:17 +0000 |
---|---|---|
committer | mb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-02-19 15:22:17 +0000 |
commit | 84296b55ed91435826d4c305d1f87c9e06566743 (patch) | |
tree | a292f0359e7d5042945a8b0ee5be65c67d48e64f /package/broadcom-diag | |
parent | 641e19bb651ea4b4bb998c68252fe09227f41e8e (diff) |
ssb: Make the GPIO API reentrancy safe.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10496 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/broadcom-diag')
-rw-r--r-- | package/broadcom-diag/src/gpio.h | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/package/broadcom-diag/src/gpio.h b/package/broadcom-diag/src/gpio.h index 22f20c99b..2284e9801 100644 --- a/package/broadcom-diag/src/gpio.h +++ b/package/broadcom-diag/src/gpio.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); } static inline u32 __ssb_write32_masked(struct ssb_device *dev, u16 offset, |