headset driver: remove gpio info pdata.

[firefly-linux-kernel-4.4.55.git] / drivers / headset_observe / rk_headset.c

diff --git a/drivers/headset_observe/rk_headset.c b/drivers/headset_observe/rk_headset.c
index 8a017e662f1488cb435dd080fcb9f2d4633a948b..21cac4ee505af1cb0c395b73b0c837ef4463b001 100755 (executable)
--- a/drivers/headset_observe/rk_headset.c
+++ b/drivers/headset_observe/rk_headset.c
@@ -448,9 +448,13 @@ static int rockchip_headsetobserve_probe(struct platform_device *pdev)
 #endif
        //------------------------------------------------------------------
        if (pdata->Headset_gpio) {
-               ret = pdata->headset_io_init(pdata->Headset_gpio, pdata->headset_gpio_info.iomux_name, pdata->headset_gpio_info.iomux_mode);
+               if(pdata->Headset_gpio == NULL){
+                       dev_err(&pdev->dev,"failed init hook,please full hook_io_init function in board\n");
+                       goto failed_free_dev;
+               }       
+               ret = pdata->headset_io_init(pdata->Headset_gpio);
                if (ret) 
-                       goto failed_free;       
+                       goto failed_free_dev;   
 
                headset->irq[HEADSET] = gpio_to_irq(pdata->Headset_gpio);
 
@@ -467,9 +471,13 @@ static int rockchip_headsetobserve_probe(struct platform_device *pdev)
                goto failed_free_dev;
 //------------------------------------------------------------------
        if (pdata->Hook_gpio) {
-               ret = pdata->hook_io_init(pdata->Hook_gpio, pdata->hook_gpio_info.iomux_name, pdata->hook_gpio_info.iomux_mode);
+               if(pdata->hook_io_init == NULL){
+                       dev_err(&pdev->dev,"failed init hook,please full hook_io_init function in board\n");
+                       goto failed_free_dev;
+               }       
+               ret = pdata->hook_io_init(pdata->Hook_gpio);
                if (ret) 
-                       goto failed_free;
+                       goto failed_free_dev;
                headset->irq[HOOK] = gpio_to_irq(pdata->Hook_gpio);
                headset->irq_type[HOOK] = pdata->Hook_down_type == HOOK_DOWN_HIGH ? IRQF_TRIGGER_RISING : IRQF_TRIGGER_FALLING;