summaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/files
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-04-08 11:49:22 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-04-08 11:49:22 +0000
commit33af3e23b00e789e32f5d74e1ce432caaa65c33f (patch)
tree9886f4685c5f864a2e8724055c5ecce007823a2f /target/linux/generic-2.6/files
parentc19a584c445282237ebbad7b36e9de14ef9549f9 (diff)
[kernel] modules/gpio-buttons: fix build error on older kernels
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10771 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/files')
-rw-r--r--target/linux/generic-2.6/files/drivers/input/misc/gpio_buttons.c29
1 files changed, 16 insertions, 13 deletions
diff --git a/target/linux/generic-2.6/files/drivers/input/misc/gpio_buttons.c b/target/linux/generic-2.6/files/drivers/input/misc/gpio_buttons.c
index 0d219ff7c..83a817834 100644
--- a/target/linux/generic-2.6/files/drivers/input/misc/gpio_buttons.c
+++ b/target/linux/generic-2.6/files/drivers/input/misc/gpio_buttons.c
@@ -15,10 +15,13 @@
*
*/
+#include <linux/kernel.h>
+#include <linux/module.h>
#include <linux/init.h>
+
+#include <linux/input.h>
#include <linux/input-polldev.h>
#include <linux/ioport.h>
-#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/gpio_buttons.h>
@@ -26,7 +29,7 @@
#include <asm/gpio.h>
#define DRV_NAME "gpio-buttons"
-#define DRV_VERSION "0.1.0"
+#define DRV_VERSION "0.1.1"
#define PFX DRV_NAME ": "
struct gpio_buttons_dev {
@@ -80,13 +83,13 @@ static int __devinit gpio_buttons_probe(struct platform_device *pdev)
bdev = kzalloc(sizeof(*bdev), GFP_KERNEL);
if (!bdev) {
- pr_err(DRV_NAME "no memory for device\n");
+ printk(KERN_ERR DRV_NAME "no memory for device\n");
return -ENOMEM;
}
poll_dev = input_allocate_polled_device();
if (!poll_dev) {
- pr_err(DRV_NAME "no memory for polled device\n");
+ printk(KERN_ERR DRV_NAME "no memory for polled device\n");
error = -ENOMEM;
goto err_free_bdev;
}
@@ -97,7 +100,7 @@ static int __devinit gpio_buttons_probe(struct platform_device *pdev)
input = poll_dev->input;
- input->evbit[0] = BIT_MASK(EV_KEY);
+ input->evbit[0] = BIT(EV_KEY);
input->name = pdev->name;
input->phys = "gpio-buttons/input0";
input->dev.parent = &pdev->dev;
@@ -115,15 +118,15 @@ static int __devinit gpio_buttons_probe(struct platform_device *pdev)
error = gpio_request(gpio, button->desc ?
button->desc : DRV_NAME);
if (error) {
- pr_err(PFX "unable to claim gpio %u, error %d\n",
- gpio, error);
+ printk(KERN_ERR PFX "unable to claim gpio %u, "
+ "error %d\n", gpio, error);
goto err_free_gpio;
}
error = gpio_direction_input(gpio);
if (error) {
- pr_err(PFX "unable to set direction on gpio %u, "
- "error %d\n", gpio, error);
+ printk(KERN_ERR PFX "unable to set direction on "
+ "gpio %u, error %d\n", gpio, error);
goto err_free_gpio;
}
@@ -137,8 +140,8 @@ static int __devinit gpio_buttons_probe(struct platform_device *pdev)
error = input_register_polled_device(poll_dev);
if (error) {
- pr_err(PFX "unable to register polled device, error %d\n",
- error);
+ printk(KERN_ERR PFX "unable to register polled device, "
+ "error %d\n", error);
goto err_free_gpio;
}
@@ -152,7 +155,7 @@ err_free_gpio:
err_free_bdev:
kfree(bdev);
-err:
+
platform_set_drvdata(pdev, NULL);
return error;
}
@@ -187,7 +190,7 @@ static struct platform_driver gpio_buttons_driver = {
static int __init gpio_buttons_init(void)
{
- pr_info(DRV_NAME " driver version " DRV_VERSION "\n");
+ printk(KERN_INFO DRV_NAME " driver version " DRV_VERSION "\n");
return platform_driver_register(&gpio_buttons_driver);
}