diff for duplicates of <20100203165754.GA22747@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 0bd4109..0d28af4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,8 +1,8 @@ -* Uwe Kleine-König <u.kleine-koenig@pengutronix.de> [100203 00:10]: +* Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de> [100203 00:10]: > Hi Tony, > > On Tue, Feb 02, 2010 at 06:25:55PM -0800, Tony Lindgren wrote: -> > From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> +> > From: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de> > > > > The only usage of _toggle_gpio_edge_triggering is in an > > CONFIG_ARCH_OMAP1 is defined, too. diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index e8022fc..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,3 +0,0 @@ -Content-Type: text/x-diff; charset=utf-8 -Content-Disposition: inline; filename="fix-gpio-warning-v2.patch" -Content-Transfer-Encoding: 8bit diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index ff66576..0000000 --- a/a/2.txt +++ /dev/null @@ -1,54 +0,0 @@ ->From 9198bcd39f558dd56823f1c9983e2252fc99a501 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de> -Date: Fri, 29 Jan 2010 14:20:05 -0800 -Subject: [PATCH] omap: define _toggle_gpio_edge_triggering only for OMAP1 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The only usage of _toggle_gpio_edge_triggering is in -an #ifdef CONFIG_ARCH_OMAP1 block, so only provide it if -CONFIG_ARCH_OMAP1 is defined, too. - -This fixes a compiler warning: - - arch/arm/plat-omap/gpio.c:758: warning: '_toggle_gpio_edge_triggering' defined but not used - -when compiling for ARCH_OMAP2, ARCH_OMAP3 or ARCH_OMAP4. - -Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> -Acked-by: Kevin Hilman <khilman@deeprootsystems.com> -Signed-off-by: Tony Lindgren <tony@atomide.com> - -diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c -index d17620c..d2422c7 100644 ---- a/arch/arm/plat-omap/gpio.c -+++ b/arch/arm/plat-omap/gpio.c -@@ -750,6 +750,7 @@ static inline void set_24xx_gpio_triggering(struct gpio_bank *bank, int gpio, - } - #endif - -+#ifdef CONFIG_ARCH_OMAP1 - /* - * This only applies to chips that can't do both rising and falling edge - * detection at once. For all other chips, this function is a noop. -@@ -760,11 +761,9 @@ static void _toggle_gpio_edge_triggering(struct gpio_bank *bank, int gpio) - u32 l = 0; - - switch (bank->method) { --#ifdef CONFIG_ARCH_OMAP1 - case METHOD_MPUIO: - reg += OMAP_MPUIO_GPIO_INT_EDGE; - break; --#endif - #ifdef CONFIG_ARCH_OMAP15XX - case METHOD_GPIO_1510: - reg += OMAP1510_GPIO_INT_CONTROL; -@@ -787,6 +786,7 @@ static void _toggle_gpio_edge_triggering(struct gpio_bank *bank, int gpio) - - __raw_writel(l, reg); - } -+#endif - - static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger) - { diff --git a/a/content_digest b/N1/content_digest index 859f984..1f7ddde 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,20 +1,17 @@ "ref\020100203022318.26347.34734.stgit@baageli.muru.com\0" "ref\020100203022555.26347.62876.stgit@baageli.muru.com\0" "ref\020100203081313.GB11354@pengutronix.de\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH 1/9] omap: define _toggle_gpio_edge_triggering only for OMAP1\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH 1/9] omap: define _toggle_gpio_edge_triggering only for OMAP1\0" "Date\0Wed, 3 Feb 2010 08:57:55 -0800\0" - "To\0Uwe Kleine-K\303\266nig <u.kleine-koenig@pengutronix.de>\0" - "Cc\0linux-arm-kernel@lists.infradead.org" - Kevin Hilman <khilman@deeprootsystems.com> - " linux-omap@vger.kernel.org\0" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" - "* Uwe Kleine-K\303\266nig <u.kleine-koenig@pengutronix.de> [100203 00:10]:\n" + "* Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de> [100203 00:10]:\n" "> Hi Tony,\n" "> \n" "> On Tue, Feb 02, 2010 at 06:25:55PM -0800, Tony Lindgren wrote:\n" - "> > From: Uwe Kleine-K\303\266nig <u.kleine-koenig@pengutronix.de>\n" + "> > From: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>\n" "> > \n" "> > The only usage of _toggle_gpio_edge_triggering is in an\n" "> > CONFIG_ARCH_OMAP1 is defined, too.\n" @@ -35,62 +32,5 @@ "1.6.6.1 it seems.\n" "\n" Tony - "\01:2\0" - "fn\0fix-gpio-warning-v2.patch\0" - "b\0" - ">From 9198bcd39f558dd56823f1c9983e2252fc99a501 Mon Sep 17 00:00:00 2001\n" - "From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>\n" - "Date: Fri, 29 Jan 2010 14:20:05 -0800\n" - "Subject: [PATCH] omap: define _toggle_gpio_edge_triggering only for OMAP1\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "\n" - "The only usage of _toggle_gpio_edge_triggering is in\n" - "an #ifdef CONFIG_ARCH_OMAP1 block, so only provide it if\n" - "CONFIG_ARCH_OMAP1 is defined, too.\n" - "\n" - "This fixes a compiler warning:\n" - "\n" - "\tarch/arm/plat-omap/gpio.c:758: warning: '_toggle_gpio_edge_triggering' defined but not used\n" - "\n" - "when compiling for ARCH_OMAP2, ARCH_OMAP3 or ARCH_OMAP4.\n" - "\n" - "Signed-off-by: Uwe Kleine-K\303\266nig <u.kleine-koenig@pengutronix.de>\n" - "Acked-by: Kevin Hilman <khilman@deeprootsystems.com>\n" - "Signed-off-by: Tony Lindgren <tony@atomide.com>\n" - "\n" - "diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c\n" - "index d17620c..d2422c7 100644\n" - "--- a/arch/arm/plat-omap/gpio.c\n" - "+++ b/arch/arm/plat-omap/gpio.c\n" - "@@ -750,6 +750,7 @@ static inline void set_24xx_gpio_triggering(struct gpio_bank *bank, int gpio,\n" - " }\n" - " #endif\n" - " \n" - "+#ifdef CONFIG_ARCH_OMAP1\n" - " /*\n" - " * This only applies to chips that can't do both rising and falling edge\n" - " * detection at once. For all other chips, this function is a noop.\n" - "@@ -760,11 +761,9 @@ static void _toggle_gpio_edge_triggering(struct gpio_bank *bank, int gpio)\n" - " \tu32 l = 0;\n" - " \n" - " \tswitch (bank->method) {\n" - "-#ifdef CONFIG_ARCH_OMAP1\n" - " \tcase METHOD_MPUIO:\n" - " \t\treg += OMAP_MPUIO_GPIO_INT_EDGE;\n" - " \t\tbreak;\n" - "-#endif\n" - " #ifdef CONFIG_ARCH_OMAP15XX\n" - " \tcase METHOD_GPIO_1510:\n" - " \t\treg += OMAP1510_GPIO_INT_CONTROL;\n" - "@@ -787,6 +786,7 @@ static void _toggle_gpio_edge_triggering(struct gpio_bank *bank, int gpio)\n" - " \n" - " \t__raw_writel(l, reg);\n" - " }\n" - "+#endif\n" - " \n" - " static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger)\n" - { -8620810abd31b84210bd0b2fdb63d5bc7d5761de5d1f6fc332b9964718055f8e +17e1e6c312dac3c83fd6afc8af2cf23cc85d276e1ace72e92312b268938659ae
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.