rk29_modem: fix warning: initialization from incompatible pointer type

diff --git a/drivers/misc/rk29_modem/rk29_modem.c b/drivers/misc/rk29_modem/rk29_modem.c
index 56de034c969300f302c02a9da01b955bedd7d58d..bff4bf5051c52c45f0dc16dff2828526dca3f0d8 100644 (file)
--- a/drivers/misc/rk29_modem/rk29_modem.c
+++ b/drivers/misc/rk29_modem/rk29_modem.c
@@ -39,7 +39,11 @@ int rk29_modem_change_status(struct rk29_modem_t *rk29_modem, int status)
     return ret;\r
 }\r
 \r
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37))\r
+static ssize_t modem_status_write(struct class *cls, struct class_attribute *attr, const char *_buf, size_t _count)\r
+#else\r
 static ssize_t modem_status_write(struct class *cls, const char *_buf, size_t _count)\r
+#endif\r
 {\r
     struct rk29_modem_t *rk29_modem = g_rk29_modem;\r
     int ret = 0;\r
@@ -92,7 +96,11 @@ static ssize_t modem_status_write(struct class *cls, const char *_buf, size_t _c
     return _count;\r
 }\r
 \r
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37))\r
+static ssize_t modem_status_read(struct class *cls, struct class_attribute *attr, char *_buf)\r
+#else\r
 static ssize_t modem_status_read(struct class *cls, char *_buf)\r
+#endif\r
 {\r
     struct rk29_modem_t *rk29_modem = g_rk29_modem;\r
 \r
@@ -101,7 +109,7 @@ static ssize_t modem_status_read(struct class *cls, char *_buf)
 static CLASS_ATTR(modem_status, 0666, modem_status_read, modem_status_write);\r
 \r
 int __devinit rk29_modem_suspend(struct platform_device *pdev, pm_message_t state)\r
-{
+{\r
 #ifdef CONFIG_PM\r
     printk("%s[%d]: %s\n", __FILE__, __LINE__, __FUNCTION__);\r
 \r
@@ -113,11 +121,11 @@ int __devinit rk29_modem_suspend(struct platform_device *pdev, pm_message_t stat
             gpio_direction_output(g_rk29_modem->ap_ready->io_addr, g_rk29_modem->ap_ready->disable);\r
     }\r
 #endif\r
-       return 0;
-}
-
+       return 0;\r
+}\r
+\r
 int __devinit rk29_modem_resume(struct platform_device *pdev)\r
-{
+{\r
 #ifdef CONFIG_PM\r
     printk("%s[%d]: %s\n", __FILE__, __LINE__, __FUNCTION__);\r
     if( g_rk29_modem->resume )\r
@@ -128,14 +136,14 @@ int __devinit rk29_modem_resume(struct platform_device *pdev)
             gpio_direction_output(g_rk29_modem->ap_ready->io_addr, g_rk29_modem->ap_ready->enable);\r
     }\r
 #endif\r
-       return 0;
+       return 0;\r
 }\r
 \r
 static irqreturn_t irq_bbwakeupap_handler(int irq, void *dev_id)\r
 {\r
+    irqreturn_t irqret = IRQ_NONE;\r
     printk("%s[%d]: %s\n", __FILE__, __LINE__, __FUNCTION__);\r
 \r
-    irqreturn_t irqret = IRQ_NONE;\r
     if( g_rk29_modem->irq_handler )\r
     {\r
         irqret = g_rk29_modem->irq_handler(irq, dev_id);\r
@@ -161,11 +169,11 @@ static int install_irq(struct rk29_irq_t *rk29_irq, const char* label)
     printk("%s[%d]: %s\n", __FILE__, __LINE__, __FUNCTION__);\r
 \r
        irq = gpio_to_irq(rk29_irq->irq_addr);\r
-    printk("%s: %d ==> %d\n", __func__, rk29_irq->irq_addr, irq);\r
+    printk("%s: %ld ==> %d\n", __func__, rk29_irq->irq_addr, irq);\r
 \r
        ret = gpio_request(rk29_irq->irq_addr, label);\r
        if (ret < 0) {\r
-               pr_err("%s: gpio_request(%d) failed\n", __func__, rk29_irq->irq_addr);\r
+               pr_err("%s: gpio_request(%ld) failed\n", __func__, rk29_irq->irq_addr);\r
                return ret;\r
        }\r
 \r