diff options
author | Michael Büsch <mb@bu3sch.de> | 2008-02-19 15:22:17 +0000 |
---|---|---|
committer | Michael Büsch <mb@bu3sch.de> | 2008-02-19 15:22:17 +0000 |
commit | faa14263f5f9617a91b4d8335f93814522c8d42b (patch) | |
tree | 0040ee1106476424deb370b40f21b482d878874a /package/broadcom-diag/src | |
parent | 66dec6d8a159cfc189f7ee635c13d9b99636f1ce (diff) | |
download | mtk-20170518-faa14263f5f9617a91b4d8335f93814522c8d42b.zip mtk-20170518-faa14263f5f9617a91b4d8335f93814522c8d42b.tar.gz mtk-20170518-faa14263f5f9617a91b4d8335f93814522c8d42b.tar.bz2 |
ssb: Make the GPIO API reentrancy safe.
SVN-Revision: 10496
Diffstat (limited to 'package/broadcom-diag/src')
-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 22f20c9..2284e98 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, |