gpio: Include linux/gpio.h instead of asm/gpio.h
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 2 Feb 2016 19:53:23 +0000 (13:53 -0600)
committerLinus Walleij <linus.walleij@linaro.org>
Mon, 15 Feb 2016 23:20:03 +0000 (00:20 +0100)
Most arches have an asm/gpio.h that merely includes linux/gpio.h.  The
others select ARCH_HAVE_CUSTOM_GPIO_H, and when that's selected,
linux/gpio.h includes asm/gpio.h.

Therefore, code should include linux/gpio.h instead of including asm/gpio.h
directly.

Remove includes of asm/gpio.h, adding an include of linux/gpio.h when
necessary.

This is a follow-on to 7563bbf89d06 ("gpiolib/arches: Centralise
bolierplate asm/gpio.h").

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
24 files changed:
arch/avr32/boards/merisc/setup.c
arch/avr32/mach-at32ap/pio.c
arch/blackfin/kernel/debug-mmrs.c
arch/blackfin/mach-bf538/boards/ezkit.c
arch/blackfin/mach-bf538/ext-gpio.c
arch/blackfin/mach-bf548/boards/cm_bf548.c
arch/blackfin/mach-bf548/boards/ezkit.c
arch/blackfin/mach-bf609/boards/ezkit.c
arch/blackfin/mach-common/ints-priority.c
arch/blackfin/mach-common/pm.c
arch/sh/include/mach-common/mach/magicpanelr2.h
drivers/ata/pata_at91.c
drivers/ata/pata_bf54x.c
drivers/gpio/gpio-mpc5200.c
drivers/mfd/menelaus.c
drivers/mtd/onenand/omap2.c
drivers/pcmcia/bfin_cf_pcmcia.c
drivers/pcmcia/pxa2xx_vpac270.c
drivers/usb/gadget/udc/atmel_usba_udc.c
drivers/usb/host/ohci-at91.c
drivers/video/fbdev/atmel_lcdfb.c
drivers/video/fbdev/omap/lcd_h3.c
drivers/video/fbdev/omap/lcd_osk.c
drivers/video/fbdev/omap/lcd_palmtt.c

index 83d896cc2aed7f4ae1f04f2563aa09329c03affa..718a6d7eb80805695c39d6525b812ce1a07abd43 100644 (file)
@@ -27,7 +27,6 @@
 
 #include <asm/io.h>
 #include <asm/setup.h>
-#include <asm/gpio.h>
 
 #include <mach/at32ap700x.h>
 #include <mach/board.h>
index 5020057ac7a2405f487cd082e90144b322ca46e1..83c2a0021b5627e909adf74b54214846327c43f2 100644 (file)
@@ -14,8 +14,8 @@
 #include <linux/fs.h>
 #include <linux/platform_device.h>
 #include <linux/irq.h>
+#include <linux/gpio.h>
 
-#include <asm/gpio.h>
 #include <asm/io.h>
 
 #include <mach/portmux.h>
index 86b1cd3a030996d8f5a70ba2b864bb386cfb6020..e272bca93c648faf9d670b7cf239ce4464a9a3e8 100644 (file)
@@ -11,9 +11,9 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/i2c/bfin_twi.h>
+#include <linux/gpio.h>
 
 #include <asm/blackfin.h>
-#include <asm/gpio.h>
 #include <asm/gptimers.h>
 #include <asm/bfin_can.h>
 #include <asm/bfin_dma.h>
index ae2fcbb001190f7acc7941952ffb0fdc944f898a..c423af36fa910835b6247e2cca53eb0bed6fb92b 100644 (file)
@@ -15,9 +15,9 @@
 #include <linux/spi/flash.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
+#include <linux/gpio.h>
 #include <asm/bfin5xx_spi.h>
 #include <asm/dma.h>
-#include <asm/gpio.h>
 #include <asm/nand.h>
 #include <asm/portmux.h>
 #include <asm/dpmc.h>
index 471a9b184d5b293ff9253c8d448dd16c8c0f7609..d3e7b66ac8d5f7c88c098fb0b78503744a604259 100644 (file)
@@ -8,8 +8,8 @@
 
 #include <linux/module.h>
 #include <linux/err.h>
+#include <linux/gpio.h>
 #include <asm/blackfin.h>
-#include <asm/gpio.h>
 #include <asm/portmux.h>
 
 #define DEFINE_REG(reg, off) \
index 6d5ffdead0676f82a546b2e363cbaaf5a30d883d..120c9941c242b4155b3aa40e406cc10899076289 100644 (file)
@@ -17,9 +17,9 @@
 #include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/usb/musb.h>
+#include <linux/gpio.h>
 #include <asm/bfin5xx_spi.h>
 #include <asm/dma.h>
-#include <asm/gpio.h>
 #include <asm/nand.h>
 #include <asm/portmux.h>
 #include <asm/bfin_sdh.h>
index 4204b9842532134e7a657bd0d7f9b5c8f1aeb7d7..3cdd4835a9f7f30fbd8f20c96030f3f9e22374ff 100644 (file)
@@ -20,9 +20,9 @@
 #include <linux/pinctrl/machine.h>
 #include <linux/pinctrl/pinconf-generic.h>
 #include <linux/platform_data/pinctrl-adi2.h>
+#include <linux/gpio.h>
 #include <asm/bfin5xx_spi.h>
 #include <asm/dma.h>
-#include <asm/gpio.h>
 #include <asm/nand.h>
 #include <asm/dpmc.h>
 #include <asm/bfin_sport.h>
index c7928d8ebb828bccea1a133aef8feb129a38775a..aad5d7416886ed7cdcf2a49f9a428a852a30fc8c 100644 (file)
@@ -21,8 +21,8 @@
 #include <linux/pinctrl/pinconf-generic.h>
 #include <linux/platform_data/pinctrl-adi2.h>
 #include <linux/spi/adi_spi3.h>
+#include <linux/gpio.h>
 #include <asm/dma.h>
-#include <asm/gpio.h>
 #include <asm/nand.h>
 #include <asm/dpmc.h>
 #include <asm/portmux.h>
index e8d4d748d0fd759222bbc4d0e07f59dbb90d4a70..4986b4fbcee982cf3a5014f17e6e7b69b666517e 100644 (file)
 #include <linux/irq.h>
 #include <linux/sched.h>
 #include <linux/syscore_ops.h>
+#include <linux/gpio.h>
 #include <asm/delay.h>
 #ifdef CONFIG_IPIPE
 #include <linux/ipipe.h>
 #endif
 #include <asm/traps.h>
 #include <asm/blackfin.h>
-#include <asm/gpio.h>
 #include <asm/irq_handler.h>
 #include <asm/dpmc.h>
 #include <asm/traps.h>
index a66d979ec6512b24857f98227e01412a3ea83a75..5ece38a5b75803f7a898ec5a68026b4d453d2b8f 100644 (file)
@@ -15,9 +15,9 @@
 #include <linux/io.h>
 #include <linux/irq.h>
 #include <linux/delay.h>
+#include <linux/gpio.h>
 
 #include <asm/cplb.h>
-#include <asm/gpio.h>
 #include <asm/dma.h>
 #include <asm/dpmc.h>
 #include <asm/pm.h>
index 183a2f7442515c630267ccc5f72131f44be82395..eb0cf205176fb56d0e600b0af5561da1f29dcaee 100644 (file)
@@ -13,7 +13,7 @@
 #ifndef __ASM_SH_MAGICPANELR2_H
 #define __ASM_SH_MAGICPANELR2_H
 
-#include <asm/gpio.h>
+#include <linux/gpio.h>
 
 #define __IO_PREFIX mpr2
 #include <asm/io_generic.h>
index ace0a4de3449ab14ed0b514fd108537709f86aa4..9f27b14009f9e0f9b34b095b99dfeae76f5d72c4 100644 (file)
@@ -30,8 +30,7 @@
 #include <linux/ata_platform.h>
 #include <linux/platform_data/atmel.h>
 #include <linux/regmap.h>
-
-#include <asm/gpio.h>
+#include <linux/gpio.h>
 
 #define DRV_NAME               "pata_at91"
 #define DRV_VERSION            "0.3"
index dd7410019d15a2fec471441fbfdeabe60cfcb309..ec748d31928d26863f352579304bbb7d08090263 100644 (file)
@@ -36,8 +36,8 @@
 #include <scsi/scsi_host.h>
 #include <linux/libata.h>
 #include <linux/platform_device.h>
+#include <linux/gpio.h>
 #include <asm/dma.h>
-#include <asm/gpio.h>
 #include <asm/portmux.h>
 
 #define DRV_NAME               "pata-bf54x"
index 0e5a6709f27d4b11eb6706d1d1b8b13ccc938948..fc10cf59691c9e097fcdfc6e4f2b14b6241ab3cb 100644 (file)
@@ -25,7 +25,6 @@
 #include <linux/of_platform.h>
 #include <linux/module.h>
 
-#include <asm/gpio.h>
 #include <asm/mpc52xx.h>
 #include <sysdev/fsl_soc.h>
 
index 3ac36f5ccd3e13ddc81b3801ff196ee815742790..a4a8f1ec3fb606c8c8a14f701015fb36740a4292 100644 (file)
 #include <linux/bcd.h>
 #include <linux/slab.h>
 #include <linux/mfd/menelaus.h>
+#include <linux/gpio.h>
 
 #include <asm/mach/irq.h>
 
-#include <asm/gpio.h>
 
 #define DRIVER_NAME                    "menelaus"
 
index 0aacf125938be059e4972d9dd154c14e8c1c9486..24a1388d3031ba3daadde14aae43da86e50e6523 100644 (file)
 #include <linux/io.h>
 #include <linux/slab.h>
 #include <linux/regulator/consumer.h>
+#include <linux/gpio.h>
 
 #include <asm/mach/flash.h>
 #include <linux/platform_data/mtd-onenand-omap2.h>
-#include <asm/gpio.h>
 
 #include <linux/omap-dma.h>
 
index bba1dcbb80753b582948009c9bb2bc36b5b1b10c..8b0923fd76c604322bd20fb482958a320e77ff36 100644 (file)
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/io.h>
+#include <linux/gpio.h>
 
 #include <pcmcia/ss.h>
 #include <pcmcia/cisreg.h>
-#include <asm/gpio.h>
 
 #define        SZ_1K   0x00000400
 #define        SZ_8K   0x00002000
index a47dcd24a26a3eab642cc7a9671e5128f581d7a1..33c5b88233679d8c1b982967e4576bbe48453fe7 100644 (file)
@@ -17,7 +17,6 @@
 
 #include <asm/mach-types.h>
 
-#include <asm/gpio.h>
 #include <mach/vpac270.h>
 
 #include "soc_common.h"
index 8755b2c2aadaa60700471f5260408bff6e28b69c..dbde1149c218656b8d70b42861ec384748af1296 100644 (file)
@@ -25,8 +25,6 @@
 #include <linux/of.h>
 #include <linux/of_gpio.h>
 
-#include <asm/gpio.h>
-
 #include "atmel_usba_udc.h"
 
 #ifdef CONFIG_USB_GADGET_DEBUG_FS
index 8c6e15bd6ff0b27ce2e8cb22c2fe03e9866f1768..95c8ddde0725cb9a3963e9d3d2b65b917121064c 100644 (file)
@@ -24,8 +24,6 @@
 #include <linux/usb.h>
 #include <linux/usb/hcd.h>
 
-#include <asm/gpio.h>
-
 #include "ohci.h"
 
 #define valid_port(index)      ((index) >= 0 && (index) < AT91_MAX_USBH_PORTS)
index 19eb42b57d8742089d2faadf5c8a64ce81cc01b3..e13b9e41957a1dc5feeb93e5b38939537fc123ed 100644 (file)
@@ -26,8 +26,6 @@
 #include <linux/regulator/consumer.h>
 #include <video/videomode.h>
 
-#include <asm/gpio.h>
-
 #include <video/atmel_lcdc.h>
 
 struct atmel_lcdfb_config {
index a0729d0200d0447c48f055746d6ee53bf571ded3..21512b027ff7abeea4847a4e2509776929960f20 100644 (file)
@@ -22,8 +22,8 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/i2c/tps65010.h>
+#include <linux/gpio.h>
 
-#include <asm/gpio.h>
 #include "omapfb.h"
 
 #define MODULE_NAME    "omapfb-lcd_h3"
index c3ddebf934b2cd161379ed0d495abf09e7ca7187..b56886c7055e6d56dde4d14e127ac3d0306f12c8 100644 (file)
@@ -22,8 +22,7 @@
 
 #include <linux/module.h>
 #include <linux/platform_device.h>
-
-#include <asm/gpio.h>
+#include <linux/gpio.h>
 
 #include <mach/hardware.h>
 #include <mach/mux.h>
index 3d0ea04ec2486c8655e1140ac58a73ce5d47f644..1a936d5c7b6f7a7a231592658a44dfe8b5fd6788 100644 (file)
@@ -28,8 +28,8 @@ GPIO13 - screen blanking
 #include <linux/platform_device.h>
 #include <linux/module.h>
 #include <linux/io.h>
+#include <linux/gpio.h>
 
-#include <asm/gpio.h>
 #include "omapfb.h"
 
 static int palmtt_panel_init(struct lcd_panel *panel,