Re: [PATCH 1/2] mfd: twl4030-madc: Add devicetree support.

From: Belisko Marek
Date: Fri Feb 14 2014 - 09:53:26 EST


On Fri, Feb 14, 2014 at 2:48 PM, Lee Jones <lee.jones@xxxxxxxxxx> wrote:
>> Signed-off-by: Marek Belisko <marek@xxxxxxxxxxxxx>
>> ---
>> .../devicetree/bindings/mfd/twl4030-madc.txt | 18 +++++++++++++
>> drivers/mfd/twl4030-madc.c | 31
>> ++++++++++++++++++++--
>
> Please separate these into different patches.
OK.
>
>> 2 files changed, 47 insertions(+), 2 deletions(-)
>> create mode 100644 Documentation/devicetree/bindings/mfd/twl4030-madc.txt
>
> <snip>
>
>> +++ b/drivers/mfd/twl4030-madc.c
>> @@ -695,6 +695,29 @@ static int twl4030_madc_set_power(struct twl4030_madc_data *madc, int on)
>> return 0;
>> }
>>
>> +#ifdef CONFIG_OF
>
> I believe we're heading for a more:
>
> if (IS_ENABLED(CONFIG_OF))
>
> ... approach. I won't enforce it, but please consider using it.
OK I'll use it in next version.
>
>> +static struct twl4030_madc_platform_data *
>> + twl4030_madc_of_parse(struct platform_device *pdev)
>> +{
>> + struct twl4030_madc_platform_data *pdata;
>> +
>> + pdata = devm_kzalloc(&pdev->dev,
>> + sizeof(struct twl4030_madc_platform_data), GFP_KERNEL);
>
> s/struct twl4030_madc_platform_data/*pdata/
Right typo.
>
>> + if (!pdata)
>> + return ERR_PTR(-ENOMEM);
>> +
>> + pdata->irq_line = platform_get_irq(pdev, 0);
>
> Why weren't 'resources' used in the original implementation?
Not sure I'm not an author :). It's passed in platform data.
>
>> + return pdata;
>> +}
>> +
>> +static const struct of_device_id twl4030_madc_dt_match_table[] = {
>> + { .compatible = "ti,twl4030-madc" },
>> + {},
>> +};
>> +
>> +#endif
>> +
>> /*
>> * Initialize MADC and request for threaded irq
>> */
>> @@ -706,8 +729,11 @@ static int twl4030_madc_probe(struct platform_device *pdev)
>> u8 regval;
>>
>> if (!pdata) {
>> - dev_err(&pdev->dev, "platform_data not available\n");
>> - return -EINVAL;
>> + pdata = twl4030_madc_of_parse(pdev);
>> + if (!pdata) {
>
> And if you received -ENOMEM?
Hmm right. I'll fix that.
>
>> + dev_err(&pdev->dev, "platform_data not available\n");
>> + return -EINVAL;
>> + }
>> }
>> madc = kzalloc(sizeof(*madc), GFP_KERNEL);
>> if (!madc)
>> @@ -807,6 +833,7 @@ static struct platform_driver twl4030_madc_driver = {
>> .driver = {
>> .name = "twl4030_madc",
>> .owner = THIS_MODULE,
>> + .of_match_table = of_match_ptr(twl4030_madc_dt_match_table),
>> },
>> };
>>
>
> --
> Lee Jones
> Linaro STMicroelectronics Landing Team Lead
> Linaro.org â Open source software for ARM SoCs
> Follow Linaro: Facebook | Twitter | Blog

BR,

marek

--
as simple and primitive as possible
-------------------------------------------------
Marek Belisko - OPEN-NANDRA
Freelance Developer

Ruska Nova Ves 219 | Presov, 08005 Slovak Republic
Tel: +421 915 052 184
skype: marekwhite
twitter: #opennandra
web: http://open-nandra.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/