From: Juha Yrjola <juha.yrjola@nokia.com>
Date: Thu, 11 Aug 2005 13:54:37 +0000 (-0700)
Subject: [PATCH] ARM: OMAP: Update gpio_switch
X-Git-Tag: v2.6.13-omap1~28^2~3
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d53dcdbd153ce2890668fefea0234af5c0bc1d6e;p=linux-2.6-omap-h63xx.git

[PATCH] ARM: OMAP: Update gpio_switch

Update gpio_switch
---

diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index f2a69af1883..07f4613c48c 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -50,10 +50,10 @@ config OMAP_BOOT_REASON
 
 config OMAP_GPIO_SWITCH
 	bool "GPIO switch support"
-        depends on OMAP_BOOT_TAG
+        depends on OMAP_BOOT_TAG && PROC_FS
         default n
         help
-          Say Y, if you want to have support for input layer reporting
+          Say Y, if you want to have support for kevent reporting
           of GPIO switches (e.g. cover switches). Your bootloader has to
           provide information about the switches to the kernel via the
           ATAG_BOARD mechanism.
diff --git a/arch/arm/plat-omap/gpio-switch.c b/arch/arm/plat-omap/gpio-switch.c
index 196073e8146..d4384a3d1b0 100644
--- a/arch/arm/plat-omap/gpio-switch.c
+++ b/arch/arm/plat-omap/gpio-switch.c
@@ -80,7 +80,9 @@ static int gpio_sw_get_state(struct gpio_switch *sw)
 	return state;
 }
 
-static ssize_t gpio_sw_store(struct device *dev, const char *buf, size_t count)
+static ssize_t gpio_sw_store(struct device *dev,
+			     struct device_attribute *attr,
+			     const char *buf, size_t count)
 {
 	struct gpio_switch *sw = dev_get_drvdata(dev);
 	int enable = (int)simple_strtoul(buf, NULL, 10);
@@ -89,7 +91,9 @@ static ssize_t gpio_sw_store(struct device *dev, const char *buf, size_t count)
 }
 
 #define gpio_sw_switch_attr(name)					\
-static ssize_t gpio_sw_show_##name(struct device *dev, char *buf)	\
+static ssize_t gpio_sw_show_##name(struct device *dev,			\
+				struct device_attribute *attr,		\
+				char *buf)				\
 {									\
 	struct gpio_switch *sw = dev_get_drvdata(dev);			\
 	return sprintf(buf, "%s\n", name##_str[gpio_sw_get_state(sw)]);	\