shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 21:07:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

headset driver: remove gpio info pdata.

Browse Source
This commit is contained in:
邱建斌
2013-09-04 19:38:11 +08:00
parent 6fcfeef46e
commit 1b863ee772
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/headset_observe/rk_headset.c
View File

@@ -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;

8
drivers/headset_observe/rk_headset.h
View File

@@ -22,11 +22,9 @@ struct rk_headset_pdata{
unsigned int Hook_down_type; //Hook key down status
int hook_key_code;
unsigned int Headset_gpio;//Detection Headset--Must be set
unsigned int headset_in_type;// Headphones into the state level--Must be set
struct io_info headset_gpio_info;
struct io_info hook_gpio_info;
int (*headset_io_init)(int, char *, int);
int (*hook_io_init)(int, char *, int);
unsigned int headset_in_type;// Headphones into the state level--Must be set
int (*headset_io_init)(int);
int (*hook_io_init)(int);
};
#endif