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>

diff --git a/Documentation/gpio.txt b/Documentation/gpio.txt
index 77a1d11af723282625dd3c3f326a5b6576fb437c..6f83fa965b4b6e6975fda4459c72f9711ea73159 100644 (file)
--- 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>
 

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 8a33ba01301ff5cb4966455699a164c27feb1484..282ff372a06ec5e6c9bb2bb8aec69a80cc532e40 100644 (file)
--- 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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 13b739469c515cb93a8dff1cdf686583a3941c54..ceac9a43da7d4d3da401151e0673bc9e837fd3cf 100644 (file)
--- 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

diff --git a/arch/arm/plat-orion/gpio.c b/arch/arm/plat-orion/gpio.c
index c29ee7ea200be1baeacb46981ddd5fad993dfe4b..59ddf4d0aca9ae6a218f45368f97aa36476cdadc 100644 (file)
--- 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)
 {

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 9b6d19f74078e0a2118e6fbd1c517e5f4f82203c..e6e700740b7eafd09a43b6bdd2ae0a566fae8c5c 100644 (file)
--- 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"

diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index d22c6b46601c81a94c8faba801085e52fbeaac98..ff775b8e322838adf6c41c578e927bfdcf8993a2 100644 (file)
--- 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
 

diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index 20e203aef0fe8b875afd094280bd886e6e07d633..71dd50b7c13a47a42dcea1c9561be6bbea3787fb 100644 (file)
--- 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"

diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig
index e4decc6b8947e4fe68180010a524e0f7b6600084..21d6ba9782e509d73c2d11dc1f8d6be1952bac6b 100644 (file)
--- 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"

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 9a02f71c6b1f7cb5e8339e55f77bb82ad9b8d8d3..38ef339190ee62730b3cfa974c63c776f5a4de71 100644 (file)
--- 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

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 6de813370b8c7d01e8b98d78634baef15da6fe3b..821170e5f6ed4e29e2135af409258d60d7fb4b4f 100644 (file)
--- 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

diff --git a/arch/metag/Kconfig b/arch/metag/Kconfig
index afc8973d14883ee340ba9531c7c82b1585f9c9cd..0e97f5c50ff487a8c5443c9f9ced73b60f7a1c5b 100644 (file)
--- 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
 

diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 1323fa2530eb7c144abe5da9ab1318e410d1c643..4fb682a7d4e942925991f998217ff21d551df307 100644 (file)
--- 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
 

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index ff0e563206cf89d5eeb27bb7463bc4223e7dcd4b..53939817958435b877d59b1f9648b51b76d19dc8 100644 (file)
--- 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
 

diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig
index e324402688998867df0c705332010e9a18eeb174..6c404eee9901a557af6a3fb0bfb8b081fe37a79c 100644 (file)
--- 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
 

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index ea5bb045983a19070958b003a8408841bce35a7c..9c5bc6882e08683ec6f9be3d1aeb820a20775aa3 100644 (file)
--- 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

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 5e859633ce69f13c9d2b1d1c1a5727ad986a9fab..f9391a692ef69bbf554e43c62e286847999a5d0f 100644 (file)
--- 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
 

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 3d361f236308c13cde14286379ec418af3e52990..90b3a0f66d909438f34bc40737753eb055ddcd98 100644 (file)
--- 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
 

diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig
index 468cd706be1d422c8b077a89aba07a6b69e34044..41bcc001344201b7487fc339264c1a513026a5dc 100644 (file)
--- 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
 

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 70c0f3da0476a35ba93546689bb4b06b5f576bba..a6298c20c6ceb52cae76b8d33c6a9706665fc118 100644 (file)
--- 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

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index b09de49dbec5cf0a7d65590afc7c2a97158399bf..acdfc615cca2a5f2a729c9fdea9480abf2d901af 100644 (file)
--- 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
 

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 93aaadf99f28c34c23be40a8e2a4f5148c450641..5d53aba8e1c6cde23b4d5d5795d5fa7496374d8b 100644 (file)
--- 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

diff --git a/drivers/gpio/gpio-lpc32xx.c b/drivers/gpio/gpio-lpc32xx.c
index 36d7dee07b28c9b1e66df8edf6699168fdf0a00f..4ad9c6b6a13480962e861573fa94b124ecab266f 100644 (file)
--- 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)