tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

gpio: Include linux/gpio.h instead of asm/gpio.h

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>

authored by

Bjorn Helgaas and committed by
Linus Walleij 288e6eaa 047b2f62

+18 -29
-1
arch/avr32/boards/merisc/setup.c
··· 27 27 28 28 #include <asm/io.h> 29 29 #include <asm/setup.h> 30 - #include <asm/gpio.h> 31 30 32 31 #include <mach/at32ap700x.h> 33 32 #include <mach/board.h>
+1 -1
arch/avr32/mach-at32ap/pio.c
··· 14 14 #include <linux/fs.h> 15 15 #include <linux/platform_device.h> 16 16 #include <linux/irq.h> 17 + #include <linux/gpio.h> 17 18 18 - #include <asm/gpio.h> 19 19 #include <asm/io.h> 20 20 21 21 #include <mach/portmux.h>
+1 -1
arch/blackfin/kernel/debug-mmrs.c
··· 11 11 #include <linux/kernel.h> 12 12 #include <linux/module.h> 13 13 #include <linux/i2c/bfin_twi.h> 14 + #include <linux/gpio.h> 14 15 15 16 #include <asm/blackfin.h> 16 - #include <asm/gpio.h> 17 17 #include <asm/gptimers.h> 18 18 #include <asm/bfin_can.h> 19 19 #include <asm/bfin_dma.h>
+1 -1
arch/blackfin/mach-bf538/boards/ezkit.c
··· 15 15 #include <linux/spi/flash.h> 16 16 #include <linux/irq.h> 17 17 #include <linux/interrupt.h> 18 + #include <linux/gpio.h> 18 19 #include <asm/bfin5xx_spi.h> 19 20 #include <asm/dma.h> 20 - #include <asm/gpio.h> 21 21 #include <asm/nand.h> 22 22 #include <asm/portmux.h> 23 23 #include <asm/dpmc.h>
+1 -1
arch/blackfin/mach-bf538/ext-gpio.c
··· 8 8 9 9 #include <linux/module.h> 10 10 #include <linux/err.h> 11 + #include <linux/gpio.h> 11 12 #include <asm/blackfin.h> 12 - #include <asm/gpio.h> 13 13 #include <asm/portmux.h> 14 14 15 15 #define DEFINE_REG(reg, off) \
+1 -1
arch/blackfin/mach-bf548/boards/cm_bf548.c
··· 17 17 #include <linux/irq.h> 18 18 #include <linux/interrupt.h> 19 19 #include <linux/usb/musb.h> 20 + #include <linux/gpio.h> 20 21 #include <asm/bfin5xx_spi.h> 21 22 #include <asm/dma.h> 22 - #include <asm/gpio.h> 23 23 #include <asm/nand.h> 24 24 #include <asm/portmux.h> 25 25 #include <asm/bfin_sdh.h>
+1 -1
arch/blackfin/mach-bf548/boards/ezkit.c
··· 20 20 #include <linux/pinctrl/machine.h> 21 21 #include <linux/pinctrl/pinconf-generic.h> 22 22 #include <linux/platform_data/pinctrl-adi2.h> 23 + #include <linux/gpio.h> 23 24 #include <asm/bfin5xx_spi.h> 24 25 #include <asm/dma.h> 25 - #include <asm/gpio.h> 26 26 #include <asm/nand.h> 27 27 #include <asm/dpmc.h> 28 28 #include <asm/bfin_sport.h>
+1 -1
arch/blackfin/mach-bf609/boards/ezkit.c
··· 21 21 #include <linux/pinctrl/pinconf-generic.h> 22 22 #include <linux/platform_data/pinctrl-adi2.h> 23 23 #include <linux/spi/adi_spi3.h> 24 + #include <linux/gpio.h> 24 25 #include <asm/dma.h> 25 - #include <asm/gpio.h> 26 26 #include <asm/nand.h> 27 27 #include <asm/dpmc.h> 28 28 #include <asm/portmux.h>
+1 -1
arch/blackfin/mach-common/ints-priority.c
··· 17 17 #include <linux/irq.h> 18 18 #include <linux/sched.h> 19 19 #include <linux/syscore_ops.h> 20 + #include <linux/gpio.h> 20 21 #include <asm/delay.h> 21 22 #ifdef CONFIG_IPIPE 22 23 #include <linux/ipipe.h> 23 24 #endif 24 25 #include <asm/traps.h> 25 26 #include <asm/blackfin.h> 26 - #include <asm/gpio.h> 27 27 #include <asm/irq_handler.h> 28 28 #include <asm/dpmc.h> 29 29 #include <asm/traps.h>
+1 -1
arch/blackfin/mach-common/pm.c
··· 15 15 #include <linux/io.h> 16 16 #include <linux/irq.h> 17 17 #include <linux/delay.h> 18 + #include <linux/gpio.h> 18 19 19 20 #include <asm/cplb.h> 20 - #include <asm/gpio.h> 21 21 #include <asm/dma.h> 22 22 #include <asm/dpmc.h> 23 23 #include <asm/pm.h>
+1 -1
arch/sh/include/mach-common/mach/magicpanelr2.h
··· 13 13 #ifndef __ASM_SH_MAGICPANELR2_H 14 14 #define __ASM_SH_MAGICPANELR2_H 15 15 16 - #include <asm/gpio.h> 16 + #include <linux/gpio.h> 17 17 18 18 #define __IO_PREFIX mpr2 19 19 #include <asm/io_generic.h>
+1 -2
drivers/ata/pata_at91.c
··· 30 30 #include <linux/ata_platform.h> 31 31 #include <linux/platform_data/atmel.h> 32 32 #include <linux/regmap.h> 33 - 34 - #include <asm/gpio.h> 33 + #include <linux/gpio.h> 35 34 36 35 #define DRV_NAME "pata_at91" 37 36 #define DRV_VERSION "0.3"
+1 -1
drivers/ata/pata_bf54x.c
··· 36 36 #include <scsi/scsi_host.h> 37 37 #include <linux/libata.h> 38 38 #include <linux/platform_device.h> 39 + #include <linux/gpio.h> 39 40 #include <asm/dma.h> 40 - #include <asm/gpio.h> 41 41 #include <asm/portmux.h> 42 42 43 43 #define DRV_NAME "pata-bf54x"
-1
drivers/gpio/gpio-mpc5200.c
··· 25 25 #include <linux/of_platform.h> 26 26 #include <linux/module.h> 27 27 28 - #include <asm/gpio.h> 29 28 #include <asm/mpc52xx.h> 30 29 #include <sysdev/fsl_soc.h> 31 30
+1 -1
drivers/mfd/menelaus.c
··· 42 42 #include <linux/bcd.h> 43 43 #include <linux/slab.h> 44 44 #include <linux/mfd/menelaus.h> 45 + #include <linux/gpio.h> 45 46 46 47 #include <asm/mach/irq.h> 47 48 48 - #include <asm/gpio.h> 49 49 50 50 #define DRIVER_NAME "menelaus" 51 51
+1 -1
drivers/mtd/onenand/omap2.c
··· 35 35 #include <linux/io.h> 36 36 #include <linux/slab.h> 37 37 #include <linux/regulator/consumer.h> 38 + #include <linux/gpio.h> 38 39 39 40 #include <asm/mach/flash.h> 40 41 #include <linux/platform_data/mtd-onenand-omap2.h> 41 - #include <asm/gpio.h> 42 42 43 43 #include <linux/omap-dma.h> 44 44
+1 -1
drivers/pcmcia/bfin_cf_pcmcia.c
··· 36 36 #include <linux/interrupt.h> 37 37 #include <linux/irq.h> 38 38 #include <linux/io.h> 39 + #include <linux/gpio.h> 39 40 40 41 #include <pcmcia/ss.h> 41 42 #include <pcmcia/cisreg.h> 42 - #include <asm/gpio.h> 43 43 44 44 #define SZ_1K 0x00000400 45 45 #define SZ_8K 0x00002000
-1
drivers/pcmcia/pxa2xx_vpac270.c
··· 17 17 18 18 #include <asm/mach-types.h> 19 19 20 - #include <asm/gpio.h> 21 20 #include <mach/vpac270.h> 22 21 23 22 #include "soc_common.h"
-2
drivers/usb/gadget/udc/atmel_usba_udc.c
··· 25 25 #include <linux/of.h> 26 26 #include <linux/of_gpio.h> 27 27 28 - #include <asm/gpio.h> 29 - 30 28 #include "atmel_usba_udc.h" 31 29 32 30 #ifdef CONFIG_USB_GADGET_DEBUG_FS
-2
drivers/usb/host/ohci-at91.c
··· 24 24 #include <linux/usb.h> 25 25 #include <linux/usb/hcd.h> 26 26 27 - #include <asm/gpio.h> 28 - 29 27 #include "ohci.h" 30 28 31 29 #define valid_port(index) ((index) >= 0 && (index) < AT91_MAX_USBH_PORTS)
-2
drivers/video/fbdev/atmel_lcdfb.c
··· 26 26 #include <linux/regulator/consumer.h> 27 27 #include <video/videomode.h> 28 28 29 - #include <asm/gpio.h> 30 - 31 29 #include <video/atmel_lcdc.h> 32 30 33 31 struct atmel_lcdfb_config {
+1 -1
drivers/video/fbdev/omap/lcd_h3.c
··· 22 22 #include <linux/module.h> 23 23 #include <linux/platform_device.h> 24 24 #include <linux/i2c/tps65010.h> 25 + #include <linux/gpio.h> 25 26 26 - #include <asm/gpio.h> 27 27 #include "omapfb.h" 28 28 29 29 #define MODULE_NAME "omapfb-lcd_h3"
+1 -2
drivers/video/fbdev/omap/lcd_osk.c
··· 22 22 23 23 #include <linux/module.h> 24 24 #include <linux/platform_device.h> 25 - 26 - #include <asm/gpio.h> 25 + #include <linux/gpio.h> 27 26 28 27 #include <mach/hardware.h> 29 28 #include <mach/mux.h>
+1 -1
drivers/video/fbdev/omap/lcd_palmtt.c
··· 28 28 #include <linux/platform_device.h> 29 29 #include <linux/module.h> 30 30 #include <linux/io.h> 31 + #include <linux/gpio.h> 31 32 32 - #include <asm/gpio.h> 33 33 #include "omapfb.h" 34 34 35 35 static int palmtt_panel_init(struct lcd_panel *panel,