Messages in this thread | | | Date | Thu, 11 Jul 2013 13:30:41 +0900 | From | Chanwoo Choi <> | Subject | Re: [PATCH V3] extcon: palmas: Option to disable ID/VBUS detection based on platform |
| |
On 07/11/2013 12:08 PM, Laxman Dewangan wrote: > On Thursday 11 July 2013 08:12 AM, Chanwoo Choi wrote: >> Hi Laxman, >> >>> static int palmas_usb_probe(struct platform_device *pdev) >>> @@ -137,20 +140,26 @@ static int palmas_usb_probe(struct platform_device *pdev) >>> struct palmas_usb *palmas_usb; >>> int status; >>> - if (node && !pdata) { >>> - pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); >>> - >>> - if (!pdata) >>> - return -ENOMEM; >>> + palmas_usb = devm_kzalloc(&pdev->dev, sizeof(*palmas_usb), GFP_KERNEL); >>> + if (!palmas_usb) >>> + return -ENOMEM; >>> - pdata->wakeup = of_property_read_bool(node, "ti,wakeup"); >>> + if (node && !pdata) { >>> + palmas_usb->wakeup = of_property_read_bool(node, "ti,wakeup"); >>> + palmas_usb->enable_id_detection = of_property_read_bool(node, >>> + "ti,enable-id-detection"); >>> + palmas_usb->enable_vbus_detection = of_property_read_bool(node, >>> + "ti,enable-vbus-detection"); >>> + } else if (pdata) { >>> + palmas_usb->wakeup = pdata->wakeup; >>> + palmas_usb->enable_id_detection = true; >>> + palmas_usb->enable_vbus_detection = true; >>> } else if (!pdata) { >>> - return -EINVAL; >>> + palmas_usb->wakeup = true; >>> + palmas_usb->enable_id_detection = true; >>> + palmas_usb->enable_vbus_detection = true; >>> } >> I think we could modify it as following patch to remove duplicate line. >> If you agree about below modification, I will apply your patch with following patch. >> > I am fine with this and this looks simple and straight. > > I have seen some patches/discussion from TI to remove the platform data support at all and hence removing from here in future will be very simple. >
This patch is applied on extcon-linus branch.
Thanks, Chanwoo Choi
| |