ramips: use gpio-keys-polled instead of gpio-buttons

[openwrt/svn-archive/archive.git] / target / linux / ramips / files / arch / mips / ralink / common / dev-gpio-buttons.c

diff --git a/target/linux/ramips/files/arch/mips/ralink/common/dev-gpio-buttons.c b/target/linux/ramips/files/arch/mips/ralink/common/dev-gpio-buttons.c
index 4d936d05c24743c1059923388f58de81272fe80f..75a2a17143bfd3c4a58edbf87883104fa1cd9b64 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/common/dev-gpio-buttons.c
+++ b/target/linux/ramips/files/arch/mips/ralink/common/dev-gpio-buttons.c
@@ -17,11 +17,11 @@
 void __init ramips_register_gpio_buttons(int id,
                                         unsigned poll_interval,
                                         unsigned nbuttons,
 void __init ramips_register_gpio_buttons(int id,
                                         unsigned poll_interval,
                                         unsigned nbuttons,

-                                        struct gpio_button *buttons)
+                                        struct gpio_keys_button *buttons)

 {
        struct platform_device *pdev;
 {
        struct platform_device *pdev;

-       struct gpio_buttons_platform_data pdata;
-       struct gpio_button *p;
+       struct gpio_keys_platform_data pdata;
+       struct gpio_keys_button *p;

        int err;
 
        p = kmalloc(nbuttons * sizeof(*p), GFP_KERNEL);
        int err;
 
        p = kmalloc(nbuttons * sizeof(*p), GFP_KERNEL);


@@ -30,7 +30,7 @@ void __init ramips_register_gpio_buttons(int id,
 
        memcpy(p, buttons, nbuttons * sizeof(*p));
 
 
        memcpy(p, buttons, nbuttons * sizeof(*p));
 

-       pdev = platform_device_alloc("gpio-buttons", id);
+       pdev = platform_device_alloc("gpio-keys-polled", id);

        if (!pdev)
                goto err_free_buttons;
 
        if (!pdev)
                goto err_free_buttons;
 


@@ -43,7 +43,6 @@ void __init ramips_register_gpio_buttons(int id,
        if (err)
                goto err_put_pdev;
 
        if (err)
                goto err_put_pdev;
 

-

        err = platform_device_add(pdev);
        if (err)
                goto err_put_pdev;
        err = platform_device_add(pdev);
        if (err)
                goto err_put_pdev;