[PATCH 1/2] adc: exynos_adc: Convert to devm_ioremap_resource()

[PATCH 1/2] adc: exynos_adc: Convert to devm_ioremap_resource()

[Sachin Kamat]

Use the newly introduced devm_ioremap_resource() instead of
devm_request_and_ioremap() which provides more consistent error handling.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 drivers/iio/adc/exynos_adc.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/iio/adc/exynos_adc.c b/drivers/iio/adc/exynos_adc.c
index 9f3a8ef..22d034a 100644
--- a/drivers/iio/adc/exynos_adc.c
+++ b/drivers/iio/adc/exynos_adc.c
@@ -270,16 +270,16 @@ static int exynos_adc_probe(struct platform_device *pdev)
 	info = iio_priv(indio_dev);
 
 	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	info->regs = devm_request_and_ioremap(&pdev->dev, mem);
-	if (!info->regs) {
-		ret = -ENOMEM;
+	info->regs = devm_ioremap_resource(&pdev->dev, mem);
+	if (IS_ERR(info->regs)) {
+		ret = PTR_ERR(info->regs);
 		goto err_iio;
 	}
 
 	mem = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-	info->enable_reg = devm_request_and_ioremap(&pdev->dev, mem);
-	if (!info->enable_reg) {
-		ret = -ENOMEM;
+	info->enable_reg = devm_ioremap_resource(&pdev->dev, mem);
+	if (IS_ERR(info->enable_reg)) {
+		ret = PTR_ERR(info->enable_reg);
 		goto err_iio;
 	}
 
-- 
1.7.9.5

[PATCH 2/2] adc: exynos_adc: Fix incorrect variable type

[Sachin Kamat]

wait_for_completion_interruptible_timeout() returns negative value on error
but is assigned to an unsigned variable. Though this might not matter much
as the return value is only tested for '0', for the sake of code correctness
modify the variable type suitably. Without this patch we get the following
smatch error:
drivers/iio/adc/exynos_adc.c:147 exynos_read_raw() error:
'wait_for_completion_interruptible_timeout()' returns negative and
'timeout' is unsigned

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 drivers/iio/adc/exynos_adc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iio/adc/exynos_adc.c b/drivers/iio/adc/exynos_adc.c
index 22d034a..3bf5132 100644
--- a/drivers/iio/adc/exynos_adc.c
+++ b/drivers/iio/adc/exynos_adc.c
@@ -118,7 +118,7 @@ static int exynos_read_raw(struct iio_dev *indio_dev,
 				long mask)
 {
 	struct exynos_adc *info = iio_priv(indio_dev);
-	unsigned long timeout;
+	long timeout;
 	u32 con1, con2;
 
 	if (mask != IIO_CHAN_INFO_RAW)
-- 
1.7.9.5

Re: [PATCH 2/2] adc: exynos_adc: Fix incorrect variable type

[Naveen Krishna Ch]

On 2 April 2013 23:23, Sachin Kamat <sachin.kamat@linaro.org> wrote:
> wait_for_completion_interruptible_timeout() returns negative value on error
> but is assigned to an unsigned variable. Though this might not matter much
> as the return value is only tested for '0', for the sake of code correctness
> modify the variable type suitably. Without this patch we get the following
> smatch error:
> drivers/iio/adc/exynos_adc.c:147 exynos_read_raw() error:
> 'wait_for_completion_interruptible_timeout()' returns negative and
> 'timeout' is unsigned
>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> ---
>  drivers/iio/adc/exynos_adc.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/iio/adc/exynos_adc.c b/drivers/iio/adc/exynos_adc.c
> index 22d034a..3bf5132 100644
> --- a/drivers/iio/adc/exynos_adc.c
> +++ b/drivers/iio/adc/exynos_adc.c
> @@ -118,7 +118,7 @@ static int exynos_read_raw(struct iio_dev *indio_dev,
>                                 long mask)
>  {
>         struct exynos_adc *info = iio_priv(indio_dev);
> -       unsigned long timeout;
> +       long timeout;
Sachin thank you for your efforts.

Apart from just changing it to long. we seem to have other corner cases
and a CL is under discussion https://patchwork.kernel.org/patch/2279591/

Doug, has replied on it as of today. We will come back with that CL soon.
>         u32 con1, con2;
>
>         if (mask != IIO_CHAN_INFO_RAW)
> --
> 1.7.9.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html



--
Shine bright,
(: Nav :)

Re: [PATCH 2/2] adc: exynos_adc: Fix incorrect variable type

[Sachin Kamat]

On 3 April 2013 22:57, Naveen Krishna Ch <naveenkrishna.ch@gmail.com> wrote:
> On 2 April 2013 23:23, Sachin Kamat <sachin.kamat@linaro.org> wrote:
>> wait_for_completion_interruptible_timeout() returns negative value on error
>> but is assigned to an unsigned variable. Though this might not matter much
>> as the return value is only tested for '0', for the sake of code correctness
>> modify the variable type suitably. Without this patch we get the following
>> smatch error:
>> drivers/iio/adc/exynos_adc.c:147 exynos_read_raw() error:
>> 'wait_for_completion_interruptible_timeout()' returns negative and
>> 'timeout' is unsigned
>>
>> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
>> ---
>>  drivers/iio/adc/exynos_adc.c |    2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/iio/adc/exynos_adc.c b/drivers/iio/adc/exynos_adc.c
>> index 22d034a..3bf5132 100644
>> --- a/drivers/iio/adc/exynos_adc.c
>> +++ b/drivers/iio/adc/exynos_adc.c
>> @@ -118,7 +118,7 @@ static int exynos_read_raw(struct iio_dev *indio_dev,
>>                                 long mask)
>>  {
>>         struct exynos_adc *info = iio_priv(indio_dev);
>> -       unsigned long timeout;
>> +       long timeout;
> Sachin thank you for your efforts.
>
> Apart from just changing it to long. we seem to have other corner cases
> and a CL is under discussion https://patchwork.kernel.org/patch/2279591/

Thanks for pointing this out. I had not seen this earlier. My patch
was to fix an obvious issue with the existing code.
However, since you have more elaborate plans about handling this,
please go ahead with that.


-- 
With warm regards,
Sachin

Re: [PATCH 1/2] adc: exynos_adc: Convert to devm_ioremap_resource()

[Sachin Kamat]

On 3 April 2013 11:53, Sachin Kamat <sachin.kamat@linaro.org> wrote:
> Use the newly introduced devm_ioremap_resource() instead of
> devm_request_and_ioremap() which provides more consistent error handling.
>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> ---
>  drivers/iio/adc/exynos_adc.c |   12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/iio/adc/exynos_adc.c b/drivers/iio/adc/exynos_adc.c
> index 9f3a8ef..22d034a 100644
> --- a/drivers/iio/adc/exynos_adc.c
> +++ b/drivers/iio/adc/exynos_adc.c
> @@ -270,16 +270,16 @@ static int exynos_adc_probe(struct platform_device *pdev)
>         info = iio_priv(indio_dev);
>
>         mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> -       info->regs = devm_request_and_ioremap(&pdev->dev, mem);
> -       if (!info->regs) {
> -               ret = -ENOMEM;
> +       info->regs = devm_ioremap_resource(&pdev->dev, mem);
> +       if (IS_ERR(info->regs)) {
> +               ret = PTR_ERR(info->regs);
>                 goto err_iio;
>         }
>
>         mem = platform_get_resource(pdev, IORESOURCE_MEM, 1);
> -       info->enable_reg = devm_request_and_ioremap(&pdev->dev, mem);
> -       if (!info->enable_reg) {
> -               ret = -ENOMEM;
> +       info->enable_reg = devm_ioremap_resource(&pdev->dev, mem);
> +       if (IS_ERR(info->enable_reg)) {
> +               ret = PTR_ERR(info->enable_reg);
>                 goto err_iio;
>         }
>
> --
> 1.7.9.5
>

Ping, Jonathan.


-- 
With warm regards,
Sachin

Re: [PATCH 1/2] adc: exynos_adc: Convert to devm_ioremap_resource()

[Jonathan Cameron]

On 15/04/13 09:22, Sachin Kamat wrote:
> On 3 April 2013 11:53, Sachin Kamat <sachin.kamat@linaro.org> wrote:
>> Use the newly introduced devm_ioremap_resource() instead of
>> devm_request_and_ioremap() which provides more consistent error handling.
>>
>> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Not sure why I missed this one.  I think I marked the entire thread
as not ready based on the responses to patch 2.  Clearly nothing wrong
with this one!  Will pick up for the next cycle now as I think it
is a cleanup rather than an actual bug fix?

Thanks for the ping.

Jonathan
>> ---
>>   drivers/iio/adc/exynos_adc.c |   12 ++++++------
>>   1 file changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/iio/adc/exynos_adc.c b/drivers/iio/adc/exynos_adc.c
>> index 9f3a8ef..22d034a 100644
>> --- a/drivers/iio/adc/exynos_adc.c
>> +++ b/drivers/iio/adc/exynos_adc.c
>> @@ -270,16 +270,16 @@ static int exynos_adc_probe(struct platform_device *pdev)
>>          info = iio_priv(indio_dev);
>>
>>          mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>> -       info->regs = devm_request_and_ioremap(&pdev->dev, mem);
>> -       if (!info->regs) {
>> -               ret = -ENOMEM;
>> +       info->regs = devm_ioremap_resource(&pdev->dev, mem);
>> +       if (IS_ERR(info->regs)) {
>> +               ret = PTR_ERR(info->regs);
>>                  goto err_iio;
>>          }
>>
>>          mem = platform_get_resource(pdev, IORESOURCE_MEM, 1);
>> -       info->enable_reg = devm_request_and_ioremap(&pdev->dev, mem);
>> -       if (!info->enable_reg) {
>> -               ret = -ENOMEM;
>> +       info->enable_reg = devm_ioremap_resource(&pdev->dev, mem);
>> +       if (IS_ERR(info->enable_reg)) {
>> +               ret = PTR_ERR(info->enable_reg);
>>                  goto err_iio;
>>          }
>>
>> --
>> 1.7.9.5
>>
>
> Ping, Jonathan.
>
>

Re: [PATCH 1/2] adc: exynos_adc: Convert to devm_ioremap_resource()

[Sachin Kamat]

On 15 April 2013 16:16, Jonathan Cameron <jic23@jic23.retrosnub.co.uk> wrote:
> On 15/04/13 09:22, Sachin Kamat wrote:
>>
>> On 3 April 2013 11:53, Sachin Kamat <sachin.kamat@linaro.org> wrote:
>>>
>>> Use the newly introduced devm_ioremap_resource() instead of
>>> devm_request_and_ioremap() which provides more consistent error handling.
>>>
>>> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
>
> Not sure why I missed this one.  I think I marked the entire thread
> as not ready based on the responses to patch 2.  Clearly nothing wrong
> with this one!  Will pick up for the next cycle now as I think it
> is a cleanup rather than an actual bug fix?

Yes this is a cleanup and hence can go in for 3.10-rc. Thanks.


-- 
With warm regards,
Sachin

Re: [PATCH 1/2] adc: exynos_adc: Convert to devm_ioremap_resource()

[Sachin Kamat]

Hi Jonathan,

On 15 April 2013 16:16, Jonathan Cameron <jic23@jic23.retrosnub.co.uk> wrote:
> On 15/04/13 09:22, Sachin Kamat wrote:
>>
>> On 3 April 2013 11:53, Sachin Kamat <sachin.kamat@linaro.org> wrote:
>>>
>>> Use the newly introduced devm_ioremap_resource() instead of
>>> devm_request_and_ioremap() which provides more consistent error handling.
>>>
>>> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
>
> Not sure why I missed this one.  I think I marked the entire thread
> as not ready based on the responses to patch 2.  Clearly nothing wrong
> with this one!  Will pick up for the next cycle now as I think it
> is a cleanup rather than an actual bug fix?
>
> Thanks for the ping.

Looks like this patch has still not made it to your tree as I did not
find it in Greg's pull request to Linus.
I however saw two of my other iio patches in his pull request.


-- 
With warm regards,
Sachin

Re: [PATCH 1/2] adc: exynos_adc: Convert to devm_ioremap_resource()

[Lars-Peter Clausen]

On 04/29/2013 07:18 PM, Sachin Kamat wrote:
> Hi Jonathan,
> 
> On 15 April 2013 16:16, Jonathan Cameron <jic23@jic23.retrosnub.co.uk> wrote:
>> On 15/04/13 09:22, Sachin Kamat wrote:
>>>
>>> On 3 April 2013 11:53, Sachin Kamat <sachin.kamat@linaro.org> wrote:
>>>>
>>>> Use the newly introduced devm_ioremap_resource() instead of
>>>> devm_request_and_ioremap() which provides more consistent error handling.
>>>>
>>>> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
>>
>> Not sure why I missed this one.  I think I marked the entire thread
>> as not ready based on the responses to patch 2.  Clearly nothing wrong
>> with this one!  Will pick up for the next cycle now as I think it
>> is a cleanup rather than an actual bug fix?
>>
>> Thanks for the ping.
> 
> Looks like this patch has still not made it to your tree as I did not
> find it in Greg's pull request to Linus.
> I however saw two of my other iio patches in his pull request.

The IIO tree was already closed at that point, so "next cycle" refers to 3.11
in this case.

- Lars

Re: [PATCH 1/2] adc: exynos_adc: Convert to devm_ioremap_resource()

[Sachin Kamat]

On 29 April 2013 23:57, Lars-Peter Clausen <lars@metafoo.de> wrote:
> On 04/29/2013 07:18 PM, Sachin Kamat wrote:
>> Hi Jonathan,
>>
>> On 15 April 2013 16:16, Jonathan Cameron <jic23@jic23.retrosnub.co.uk> wrote:
>>> On 15/04/13 09:22, Sachin Kamat wrote:
>>>>
>>>> On 3 April 2013 11:53, Sachin Kamat <sachin.kamat@linaro.org> wrote:
>>>>>
>>>>> Use the newly introduced devm_ioremap_resource() instead of
>>>>> devm_request_and_ioremap() which provides more consistent error handling.
>>>>>
>>>>> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
>>>
>>> Not sure why I missed this one.  I think I marked the entire thread
>>> as not ready based on the responses to patch 2.  Clearly nothing wrong
>>> with this one!  Will pick up for the next cycle now as I think it
>>> is a cleanup rather than an actual bug fix?
>>>
>>> Thanks for the ping.
>>
>> Looks like this patch has still not made it to your tree as I did not
>> find it in Greg's pull request to Linus.
>> I however saw two of my other iio patches in his pull request.
>
> The IIO tree was already closed at that point, so "next cycle" refers to 3.11
> in this case.

Oh OK. Got it :)
Thanks for the clarification.

-- 
With warm regards,
Sachin

Re: [PATCH 1/2] adc: exynos_adc: Convert to devm_ioremap_resource()

[Jonathan Cameron]

On 04/30/2013 03:59 AM, Sachin Kamat wrote:
> On 29 April 2013 23:57, Lars-Peter Clausen <lars@metafoo.de> wrote:
>> On 04/29/2013 07:18 PM, Sachin Kamat wrote:
>>> Hi Jonathan,
>>>
>>> On 15 April 2013 16:16, Jonathan Cameron <jic23@jic23.retrosnub.co.uk> wrote:
>>>> On 15/04/13 09:22, Sachin Kamat wrote:
>>>>>
>>>>> On 3 April 2013 11:53, Sachin Kamat <sachin.kamat@linaro.org> wrote:
>>>>>>
>>>>>> Use the newly introduced devm_ioremap_resource() instead of
>>>>>> devm_request_and_ioremap() which provides more consistent error handling.
>>>>>>
>>>>>> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
>>>>
>>>> Not sure why I missed this one.  I think I marked the entire thread
>>>> as not ready based on the responses to patch 2.  Clearly nothing wrong
>>>> with this one!  Will pick up for the next cycle now as I think it
>>>> is a cleanup rather than an actual bug fix?
>>>>
>>>> Thanks for the ping.
>>>
>>> Looks like this patch has still not made it to your tree as I did not
>>> find it in Greg's pull request to Linus.
>>> I however saw two of my other iio patches in his pull request.
>>
>> The IIO tree was already closed at that point, so "next cycle" refers to 3.11
>> in this case.
> 
> Oh OK. Got it :)
> Thanks for the clarification.
> 
Now finally applied to the togreg branch of iio.git.
Will hopefully send upstream sometime over next few days at which point it will hit
linux-next and be ready for the next merge cycle.

Jonathan