Remove GENERIC_GPIO config option

GENERIC_GPIO has been made equivalent to GPIOLIB in architecture code and all driver code has been switch to depend on GPIOLIB. It is thus safe to have GENERIC_GPIO removed. Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Grant Likely <grant.likely@secretlab.ca>
2013-03-28 05:07:46 -07:00 · 2013-03-28 05:07:46 -07:00 · 7fd2bf3d32
--- a/Documentation/gpio.txt
+++ b/Documentation/gpio.txt
@ -72,11 +72,11 @@ in this document, but drivers acting as clients to the GPIO interface must
 not care how it's implemented.)

 That said, if the convention is supported on their platform, drivers should
-use it when possible.  Platforms must declare GENERIC_GPIO support in their
-Kconfig (boolean true), and provide an <asm/gpio.h> file.  Drivers that can't
-work without standard GPIO calls should have Kconfig entries which depend
-on GENERIC_GPIO.  The GPIO calls are available, either as "real code" or as
-optimized-away stubs, when drivers use the include file:
+use it when possible.  Platforms must select ARCH_REQUIRE_GPIOLIB or
+ARCH_WANT_OPTIONAL_GPIOLIB in their Kconfig.  Drivers that can't work without
+standard GPIO calls should have Kconfig entries which depend on GPIOLIB.  The
+GPIO calls are available, either as "real code" or as optimized-away stubs,
+when drivers use the include file:

 	#include <linux/gpio.h>

--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@ -56,9 +56,6 @@ config GENERIC_CALIBRATE_DELAY
 	bool
 	default y

-config GENERIC_GPIO
-	bool
-
 config ZONE_DMA
 	bool
 	default y
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@ -107,9 +107,6 @@ config MIGHT_HAVE_PCI
 config SYS_SUPPORTS_APM_EMULATION
 	bool

-config GENERIC_GPIO
-	bool
-
 config HAVE_TCM
 	bool
 	select GENERIC_ALLOCATOR
--- a/arch/arm/plat-orion/gpio.c
+++ b/arch/arm/plat-orion/gpio.c
@ -150,7 +150,7 @@ err_out:
 }

 /*
- * GENERIC_GPIO primitives.
+ * GPIO primitives.
 */
 static int orion_gpio_request(struct gpio_chip *chip, unsigned pin)
 {
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@ -92,9 +92,6 @@ config SWIOTLB
 config IOMMU_HELPER
 	def_bool SWIOTLB

-config GENERIC_GPIO
-	bool
-
 source "init/Kconfig"

 source "kernel/Kconfig.freezer"
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@ -26,9 +26,6 @@ config AVR32
 	  There is an AVR32 Linux project with a web page at
 	  http://avr32linux.org/.

-config GENERIC_GPIO
-	def_bool n
-
 config STACKTRACE_SUPPORT
 	def_bool y

--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@ -55,9 +55,6 @@ config GENERIC_BUG
 config ZONE_DMA
 	def_bool y

-config GENERIC_GPIO
-	def_bool n
-
 config FORCE_MAX_ZONEORDER
 	int
 	default "14"
--- a/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig
@ -170,9 +170,6 @@ source "mm/Kconfig"

 source "kernel/Kconfig.hz"

-config GENERIC_GPIO
-	def_bool n
-
 endmenu

 source "init/Kconfig"
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@ -101,9 +101,6 @@ config GENERIC_CALIBRATE_DELAY
 config HAVE_SETUP_PER_CPU_AREA
 	def_bool y

-config GENERIC_GPIO
-	bool
-
 config DMI
 	bool
 	default y
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@ -35,9 +35,6 @@ config ARCH_HAS_ILOG2_U32
 config ARCH_HAS_ILOG2_U64
 	bool

-config GENERIC_GPIO
-	bool
-
 config GENERIC_HWEIGHT
 	bool
 	default y
--- a/arch/metag/Kconfig
+++ b/arch/metag/Kconfig
@ -54,9 +54,6 @@ config GENERIC_HWEIGHT
 config GENERIC_CALIBRATE_DELAY
 	def_bool y

-config GENERIC_GPIO
-	def_bool n
-
 config NO_IOPORT
 	def_bool y

--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@ -56,9 +56,6 @@ config GENERIC_HWEIGHT
 config GENERIC_CALIBRATE_DELAY
 	def_bool y

-config GENERIC_GPIO
-	bool
-
 config GENERIC_CSUM
 	def_bool y

--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@ -1004,9 +1004,6 @@ config GENERIC_ISA_DMA_SUPPORT_BROKEN
 config ISA_DMA_API
 	bool

-config GENERIC_GPIO
-	bool
-
 config HOLES_IN_ZONE
 	bool

--- a/arch/openrisc/Kconfig
+++ b/arch/openrisc/Kconfig
@ -44,9 +44,6 @@ config GENERIC_HWEIGHT
 config NO_IOPORT
 	def_bool y

-config GENERIC_GPIO
-	def_bool n
-
 config TRACE_IRQFLAGS_SUPPORT
        def_bool y

--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@ -82,11 +82,6 @@ config GENERIC_HWEIGHT
 	bool
 	default y

-config GENERIC_GPIO
-	bool
-	help
-	  Generic GPIO API support
-
 config PPC
 	bool
 	default y
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@ -92,9 +92,6 @@ config GENERIC_CSUM
 config GENERIC_HWEIGHT
 	def_bool y

-config GENERIC_GPIO
-	def_bool n
-
 config GENERIC_CALIBRATE_DELAY
 	bool

--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@ -135,11 +135,6 @@ config GENERIC_ISA_DMA
 	bool
 	default y if SPARC32

-config GENERIC_GPIO
-	bool
-	help
-	  Generic GPIO API support
-
 config ARCH_SUPPORTS_DEBUG_PAGEALLOC
 	def_bool y if SPARC64

--- a/arch/unicore32/Kconfig
+++ b/arch/unicore32/Kconfig
@ -23,9 +23,6 @@ config UNICORE32
 	  designs licensed by PKUnity Ltd.
 	  Please see web page at <http://www.pkunity.com/>.

-config GENERIC_GPIO
-	bool
-
 config GENERIC_CSUM
 	def_bool y

--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@ -172,9 +172,6 @@ config GENERIC_BUG_RELATIVE_POINTERS
 config GENERIC_HWEIGHT
 	def_bool y

-config GENERIC_GPIO
-	bool
-
 config ARCH_MAY_HAVE_PC_FDC
 	def_bool y
 	depends on ISA_DMA_API
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@ -33,9 +33,6 @@ config RWSEM_XCHGADD_ALGORITHM
 config GENERIC_HWEIGHT
 	def_bool y

-config GENERIC_GPIO
-	bool
-
 config ARCH_HAS_ILOG2_U32
 	def_bool n

--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@ -38,7 +38,6 @@ config GPIO_DEVRES
 menuconfig GPIOLIB
 	bool "GPIO Support"
 	depends on ARCH_WANT_OPTIONAL_GPIOLIB || ARCH_REQUIRE_GPIOLIB
-	select GENERIC_GPIO
 	help
 	  This enables GPIO support through the generic GPIO library.
 	  You only need to enable this, if you also want to enable
--- a/drivers/gpio/gpio-lpc32xx.c
+++ b/drivers/gpio/gpio-lpc32xx.c
@ -255,7 +255,7 @@ static int __get_gpo_state_p3(struct lpc32xx_gpio_chip *group,
 }

 /*
- * GENERIC_GPIO primitives.
+ * GPIO primitives.
 */
 static int lpc32xx_gpio_dir_input_p012(struct gpio_chip *chip,
 	unsigned pin)