[PATCH -next] iio: adc: mxs-lradc: Fix return value check in mxs_lradc_adc_probe()

[PATCH -next] iio: adc: mxs-lradc: Fix return value check in mxs_lradc_adc_probe()

[Wei Yongjun]

From: Wei Yongjun <weiyongjun1@huawei.com>

In case of error, the function devm_ioremap() returns NULL pointer
not ERR_PTR(). The IS_ERR() test in the return value check should
be replaced with NULL test.

Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
---
 drivers/iio/adc/mxs-lradc-adc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/iio/adc/mxs-lradc-adc.c b/drivers/iio/adc/mxs-lradc-adc.c
index b0c7d8e..493e2a2 100644
--- a/drivers/iio/adc/mxs-lradc-adc.c
+++ b/drivers/iio/adc/mxs-lradc-adc.c
@@ -719,8 +719,8 @@ static int mxs_lradc_adc_probe(struct platform_device *pdev)
 
 	iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	adc->base = devm_ioremap(dev, iores->start, resource_size(iores));
-	if (IS_ERR(adc->base))
-		return PTR_ERR(adc->base);
+	if (!adc->base)
+		return -ENOMEM;
 
 	init_completion(&adc->completion);
 	spin_lock_init(&adc->lock);

Re: [PATCH -next] iio: adc: mxs-lradc: Fix return value check in mxs_lradc_adc_probe()

[Jonathan Cameron]

On 25/04/17 04:36, Wei Yongjun wrote:
> From: Wei Yongjun <weiyongjun1@huawei.com>
> 
> In case of error, the function devm_ioremap() returns NULL pointer
> not ERR_PTR(). The IS_ERR() test in the return value check should
> be replaced with NULL test.
> 
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Acked-by: Jonathan Cameron <jic23@kernel.org>

Lee, do you want to pick this up?  If not I'll scoop it up after the merge
window has unwound as a fix.  Needs to be on top of the series:
[PATCH v15 0/5] mxs-lradc: Split driver into MFD

Thanks,

Jonathan
> ---
>  drivers/iio/adc/mxs-lradc-adc.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/iio/adc/mxs-lradc-adc.c b/drivers/iio/adc/mxs-lradc-adc.c
> index b0c7d8e..493e2a2 100644
> --- a/drivers/iio/adc/mxs-lradc-adc.c
> +++ b/drivers/iio/adc/mxs-lradc-adc.c
> @@ -719,8 +719,8 @@ static int mxs_lradc_adc_probe(struct platform_device *pdev)
>  
>  	iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>  	adc->base = devm_ioremap(dev, iores->start, resource_size(iores));
> -	if (IS_ERR(adc->base))
> -		return PTR_ERR(adc->base);
> +	if (!adc->base)
> +		return -ENOMEM;
>  
>  	init_completion(&adc->completion);
>  	spin_lock_init(&adc->lock);
> 
> --
> 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
> 

Re: [PATCH -next] iio: adc: mxs-lradc: Fix return value check in mxs_lradc_adc_probe()

[Lee Jones]

On Wed, 26 Apr 2017, Jonathan Cameron wrote:

> On 25/04/17 04:36, Wei Yongjun wrote:
> > From: Wei Yongjun <weiyongjun1@huawei.com>
> > 
> > In case of error, the function devm_ioremap() returns NULL pointer
> > not ERR_PTR(). The IS_ERR() test in the return value check should
> > be replaced with NULL test.
> > 
> > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
> Acked-by: Jonathan Cameron <jic23@kernel.org>
> 
> Lee, do you want to pick this up?  If not I'll scoop it up after the merge
> window has unwound as a fix.  Needs to be on top of the series:
> [PATCH v15 0/5] mxs-lradc: Split driver into MFD

I'm inclined to agree with Dmitry:

https://www.spinics.net/lists/linux-input/msg51061.html

> > ---
> >  drivers/iio/adc/mxs-lradc-adc.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/iio/adc/mxs-lradc-adc.c b/drivers/iio/adc/mxs-lradc-adc.c
> > index b0c7d8e..493e2a2 100644
> > --- a/drivers/iio/adc/mxs-lradc-adc.c
> > +++ b/drivers/iio/adc/mxs-lradc-adc.c
> > @@ -719,8 +719,8 @@ static int mxs_lradc_adc_probe(struct platform_device *pdev)
> >  
> >  	iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> >  	adc->base = devm_ioremap(dev, iores->start, resource_size(iores));
> > -	if (IS_ERR(adc->base))
> > -		return PTR_ERR(adc->base);
> > +	if (!adc->base)
> > +		return -ENOMEM;
> >  
> >  	init_completion(&adc->completion);
> >  	spin_lock_init(&adc->lock);
> > 
> 

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

RE: [PATCH -next] iio: adc: mxs-lradc: Fix return value check in mxs_lradc_adc_probe()

[weiyongjun (A)]

PiANCj4gT24gV2VkLCAyNiBBcHIgMjAxNywgSm9uYXRoYW4gQ2FtZXJvbiB3cm90ZToNCj4gDQo+
ID4gT24gMjUvMDQvMTcgMDQ6MzYsIFdlaSBZb25nanVuIHdyb3RlOg0KPiA+ID4gRnJvbTogV2Vp
IFlvbmdqdW4gPHdlaXlvbmdqdW4xQGh1YXdlaS5jb20+DQo+ID4gPg0KPiA+ID4gSW4gY2FzZSBv
ZiBlcnJvciwgdGhlIGZ1bmN0aW9uIGRldm1faW9yZW1hcCgpIHJldHVybnMgTlVMTCBwb2ludGVy
DQo+ID4gPiBub3QgRVJSX1BUUigpLiBUaGUgSVNfRVJSKCkgdGVzdCBpbiB0aGUgcmV0dXJuIHZh
bHVlIGNoZWNrIHNob3VsZA0KPiA+ID4gYmUgcmVwbGFjZWQgd2l0aCBOVUxMIHRlc3QuDQo+ID4g
Pg0KPiA+ID4gU2lnbmVkLW9mZi1ieTogV2VpIFlvbmdqdW4gPHdlaXlvbmdqdW4xQGh1YXdlaS5j
b20+DQo+ID4gQWNrZWQtYnk6IEpvbmF0aGFuIENhbWVyb24gPGppYzIzQGtlcm5lbC5vcmc+DQo+
ID4NCj4gPiBMZWUsIGRvIHlvdSB3YW50IHRvIHBpY2sgdGhpcyB1cD8gIElmIG5vdCBJJ2xsIHNj
b29wIGl0IHVwIGFmdGVyIHRoZSBtZXJnZQ0KPiA+IHdpbmRvdyBoYXMgdW53b3VuZCBhcyBhIGZp
eC4gIE5lZWRzIHRvIGJlIG9uIHRvcCBvZiB0aGUgc2VyaWVzOg0KPiA+IFtQQVRDSCB2MTUgMC81
XSBteHMtbHJhZGM6IFNwbGl0IGRyaXZlciBpbnRvIE1GRA0KPiANCj4gSSdtIGluY2xpbmVkIHRv
IGFncmVlIHdpdGggRG1pdHJ5Og0KPiANCj4gaHR0cHM6Ly93d3cuc3Bpbmljcy5uZXQvbGlzdHMv
bGludXgtaW5wdXQvbXNnNTEwNjEuaHRtbA0KDQpOb3Qgc3VyZSB3ZSBjYW4gdXNlIGRldm1faW9y
ZW1hcF9yZXNvdXJjZSgpLCBpZiBpdCBpcyBzYWZlLCBJIHdpbGwNCnNlbmQgdjIgdmVyc2lvbiBw
YXRjaCB0byB1c2UgZGV2bV9pb3JlbWFwX3Jlc291cmNlKCkgaW5zdGVhZC4NCg0KPiANCj4gPiA+
IC0tLQ0KPiA+ID4gIGRyaXZlcnMvaWlvL2FkYy9teHMtbHJhZGMtYWRjLmMgfCA0ICsrLS0NCj4g
PiA+ICAxIGZpbGUgY2hhbmdlZCwgMiBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQ0KPiA+
ID4NCj4gPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2lpby9hZGMvbXhzLWxyYWRjLWFkYy5jIGIv
ZHJpdmVycy9paW8vYWRjL214cy1scmFkYy0NCj4gYWRjLmMNCj4gPiA+IGluZGV4IGIwYzdkOGUu
LjQ5M2UyYTIgMTAwNjQ0DQo+ID4gPiAtLS0gYS9kcml2ZXJzL2lpby9hZGMvbXhzLWxyYWRjLWFk
Yy5jDQo+ID4gPiArKysgYi9kcml2ZXJzL2lpby9hZGMvbXhzLWxyYWRjLWFkYy5jDQo+ID4gPiBA
QCAtNzE5LDggKzcxOSw4IEBAIHN0YXRpYyBpbnQgbXhzX2xyYWRjX2FkY19wcm9iZShzdHJ1Y3QN
Cj4gcGxhdGZvcm1fZGV2aWNlICpwZGV2KQ0KPiA+ID4NCj4gPiA+ICAJaW9yZXMgPSBwbGF0Zm9y
bV9nZXRfcmVzb3VyY2UocGRldiwgSU9SRVNPVVJDRV9NRU0sIDApOw0KPiA+ID4gIAlhZGMtPmJh
c2UgPSBkZXZtX2lvcmVtYXAoZGV2LCBpb3Jlcy0+c3RhcnQsIHJlc291cmNlX3NpemUoaW9yZXMp
KTsNCj4gPiA+IC0JaWYgKElTX0VSUihhZGMtPmJhc2UpKQ0KPiA+ID4gLQkJcmV0dXJuIFBUUl9F
UlIoYWRjLT5iYXNlKTsNCj4gPiA+ICsJaWYgKCFhZGMtPmJhc2UpDQo+ID4gPiArCQlyZXR1cm4g
LUVOT01FTTsNCj4gPiA+DQo+ID4gPiAgCWluaXRfY29tcGxldGlvbigmYWRjLT5jb21wbGV0aW9u
KTsNCj4gPiA+ICAJc3Bpbl9sb2NrX2luaXQoJmFkYy0+bG9jayk7DQo+ID4gPg0KPiA+DQo+IA0K
PiAtLQ0KPiBMZWUgSm9uZXMNCj4gTGluYXJvIFNUTWljcm9lbGVjdHJvbmljcyBMYW5kaW5nIFRl
YW0gTGVhZA0KPiBMaW5hcm8ub3JnIOKUgiBPcGVuIHNvdXJjZSBzb2Z0d2FyZSBmb3IgQVJNIFNv
Q3MNCj4gRm9sbG93IExpbmFybzogRmFjZWJvb2sgfCBUd2l0dGVyIHwgQmxvZw0K

Re: [PATCH -next] iio: adc: mxs-lradc: Fix return value check in mxs_lradc_adc_probe()

[Lee Jones]

On Wed, 26 Apr 2017, weiyongjun (A) wrote:

> > 
> > On Wed, 26 Apr 2017, Jonathan Cameron wrote:
> > 
> > > On 25/04/17 04:36, Wei Yongjun wrote:
> > > > From: Wei Yongjun <weiyongjun1@huawei.com>
> > > >
> > > > In case of error, the function devm_ioremap() returns NULL pointer
> > > > not ERR_PTR(). The IS_ERR() test in the return value check should
> > > > be replaced with NULL test.
> > > >
> > > > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
> > > Acked-by: Jonathan Cameron <jic23@kernel.org>
> > >
> > > Lee, do you want to pick this up?  If not I'll scoop it up after the merge
> > > window has unwound as a fix.  Needs to be on top of the series:
> > > [PATCH v15 0/5] mxs-lradc: Split driver into MFD
> > 
> > I'm inclined to agree with Dmitry:
> > 
> > https://www.spinics.net/lists/linux-input/msg51061.html
> 
> Not sure we can use devm_ioremap_resource(), if it is safe, I will
> send v2 version patch to use devm_ioremap_resource() instead.

What makes you think it might not be safe?

> > > > ---
> > > >  drivers/iio/adc/mxs-lradc-adc.c | 4 ++--
> > > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > > >
> > > > diff --git a/drivers/iio/adc/mxs-lradc-adc.c b/drivers/iio/adc/mxs-lradc-
> > adc.c
> > > > index b0c7d8e..493e2a2 100644
> > > > --- a/drivers/iio/adc/mxs-lradc-adc.c
> > > > +++ b/drivers/iio/adc/mxs-lradc-adc.c
> > > > @@ -719,8 +719,8 @@ static int mxs_lradc_adc_probe(struct
> > platform_device *pdev)
> > > >
> > > >  	iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> > > >  	adc->base = devm_ioremap(dev, iores->start, resource_size(iores));
> > > > -	if (IS_ERR(adc->base))
> > > > -		return PTR_ERR(adc->base);
> > > > +	if (!adc->base)
> > > > +		return -ENOMEM;
> > > >
> > > >  	init_completion(&adc->completion);
> > > >  	spin_lock_init(&adc->lock);
> > > >
> > >
> > 

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

RE: [PATCH -next] iio: adc: mxs-lradc: Fix return value check in mxs_lradc_adc_probe()

[weiyongjun (A)]

PiANCj4gT24gV2VkLCAyNiBBcHIgMjAxNywgd2VpeW9uZ2p1biAoQSkgd3JvdGU6DQo+IA0KPiA+
ID4NCj4gPiA+IE9uIFdlZCwgMjYgQXByIDIwMTcsIEpvbmF0aGFuIENhbWVyb24gd3JvdGU6DQo+
ID4gPg0KPiA+ID4gPiBPbiAyNS8wNC8xNyAwNDozNiwgV2VpIFlvbmdqdW4gd3JvdGU6DQo+ID4g
PiA+ID4gRnJvbTogV2VpIFlvbmdqdW4gPHdlaXlvbmdqdW4xQGh1YXdlaS5jb20+DQo+ID4gPiA+
ID4NCj4gPiA+ID4gPiBJbiBjYXNlIG9mIGVycm9yLCB0aGUgZnVuY3Rpb24gZGV2bV9pb3JlbWFw
KCkgcmV0dXJucyBOVUxMIHBvaW50ZXINCj4gPiA+ID4gPiBub3QgRVJSX1BUUigpLiBUaGUgSVNf
RVJSKCkgdGVzdCBpbiB0aGUgcmV0dXJuIHZhbHVlIGNoZWNrIHNob3VsZA0KPiA+ID4gPiA+IGJl
IHJlcGxhY2VkIHdpdGggTlVMTCB0ZXN0Lg0KPiA+ID4gPiA+DQo+ID4gPiA+ID4gU2lnbmVkLW9m
Zi1ieTogV2VpIFlvbmdqdW4gPHdlaXlvbmdqdW4xQGh1YXdlaS5jb20+DQo+ID4gPiA+IEFja2Vk
LWJ5OiBKb25hdGhhbiBDYW1lcm9uIDxqaWMyM0BrZXJuZWwub3JnPg0KPiA+ID4gPg0KPiA+ID4g
PiBMZWUsIGRvIHlvdSB3YW50IHRvIHBpY2sgdGhpcyB1cD8gIElmIG5vdCBJJ2xsIHNjb29wIGl0
IHVwIGFmdGVyIHRoZSBtZXJnZQ0KPiA+ID4gPiB3aW5kb3cgaGFzIHVud291bmQgYXMgYSBmaXgu
ICBOZWVkcyB0byBiZSBvbiB0b3Agb2YgdGhlIHNlcmllczoNCj4gPiA+ID4gW1BBVENIIHYxNSAw
LzVdIG14cy1scmFkYzogU3BsaXQgZHJpdmVyIGludG8gTUZEDQo+ID4gPg0KPiA+ID4gSSdtIGlu
Y2xpbmVkIHRvIGFncmVlIHdpdGggRG1pdHJ5Og0KPiA+ID4NCj4gPiA+IGh0dHBzOi8vd3d3LnNw
aW5pY3MubmV0L2xpc3RzL2xpbnV4LWlucHV0L21zZzUxMDYxLmh0bWwNCj4gPg0KPiA+IE5vdCBz
dXJlIHdlIGNhbiB1c2UgZGV2bV9pb3JlbWFwX3Jlc291cmNlKCksIGlmIGl0IGlzIHNhZmUsIEkg
d2lsbA0KPiA+IHNlbmQgdjIgdmVyc2lvbiBwYXRjaCB0byB1c2UgZGV2bV9pb3JlbWFwX3Jlc291
cmNlKCkgaW5zdGVhZC4NCj4gDQo+IFdoYXQgbWFrZXMgeW91IHRoaW5rIGl0IG1pZ2h0IG5vdCBi
ZSBzYWZlPw0KDQoNCkxhc3QgdGltZSwgd2hlbiBJIGZpeCB0aGUgc2FtZSBpc3N1ZSBmb3Igb3Ro
ZXIgZHJpdmVyLCBhbmQgY2F1c2UgcHJvYmxlbS4gU28gSSBhbQ0Kbm90IHN1cmUgd2hldGhlciB3
ZSBjYW4gY29udmVydCB0byB1c2UgZGV2bV9pb3JlbWFwX3Jlc291cmNlLg0KDQo9PT09DQpTb21l
IHBpbmN0cmxzIHNoYXJlIG1lbW9yeSByZWdpb25zLCBhbmQgZGV2bV9pb3JlbWFwX3Jlc291cmNl
IGRvZXMgbm90DQphbGxvdyB0byBzaGFyZSByZXNvdXJjZXMsIGluIG9wcG9zaXRpb24gdG8gZGV2
bV9pb3JlbWFwLg0KVGhpcyBwYXRjaCByZXN0b3JlcyBiYWNrIHVzYWdlIG9mIGRldm1faW9yZW1h
cCBmdW5jdGlvbiwgYnV0IHdpdGggcHJvcGVyDQplcnJvciBoYW5kbGluZyBhbmQgbG9nZ2luZy4N
Cj09PT0NCg0KaHR0cHM6Ly93d3cuc3Bpbmljcy5uZXQvbGlzdHMvbGludXgtc2Ftc3VuZy1zb2Mv
bXNnNTgzNjYuaHRtbA0KDQoNClJlZ2FyZHMsDQpZb25nanVuIFdlaQ0K

Re: [PATCH -next] iio: adc: mxs-lradc: Fix return value check in mxs_lradc_adc_probe()

[Jonathan Cameron]

On 26 April 2017 01:49:58 GMT-07:00, Lee Jones <lee.jones@linaro.org> wrote:
>On Wed, 26 Apr 2017, Jonathan Cameron wrote:
>
>> On 25/04/17 04:36, Wei Yongjun wrote:
>> > From: Wei Yongjun <weiyongjun1@huawei.com>
>> > 
>> > In case of error, the function devm_ioremap() returns NULL pointer
>> > not ERR_PTR(). The IS_ERR() test in the return value check should
>> > be replaced with NULL test.
>> > 
>> > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
>> Acked-by: Jonathan Cameron <jic23@kernel.org>
>> 
>> Lee, do you want to pick this up?  If not I'll scoop it up after the
>merge
>> window has unwound as a fix.  Needs to be on top of the series:
>> [PATCH v15 0/5] mxs-lradc: Split driver into MFD
>
>I'm inclined to agree with Dmitry:
>
>https://www.spinics.net/lists/linux-input/msg51061.html
Agreed. Tidier fix
>
>> > ---
>> >  drivers/iio/adc/mxs-lradc-adc.c | 4 ++--
>> >  1 file changed, 2 insertions(+), 2 deletions(-)
>> > 
>> > diff --git a/drivers/iio/adc/mxs-lradc-adc.c
>b/drivers/iio/adc/mxs-lradc-adc.c
>> > index b0c7d8e..493e2a2 100644
>> > --- a/drivers/iio/adc/mxs-lradc-adc.c
>> > +++ b/drivers/iio/adc/mxs-lradc-adc.c
>> > @@ -719,8 +719,8 @@ static int mxs_lradc_adc_probe(struct
>platform_device *pdev)
>> >  
>> >  	iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>> >  	adc->base = devm_ioremap(dev, iores->start,
>resource_size(iores));
>> > -	if (IS_ERR(adc->base))
>> > -		return PTR_ERR(adc->base);
>> > +	if (!adc->base)
>> > +		return -ENOMEM;
>> >  
>> >  	init_completion(&adc->completion);
>> >  	spin_lock_init(&adc->lock);
>> > 
>> 

-- 
Sent from my Android device with K-9 Mail. Please excuse my brevity.

[PATCH -next v2] iio: adc: mxs-lradc: Fix return value check in mxs_lradc_adc_probe()

[Wei Yongjun]

From: Wei Yongjun <weiyongjun1@huawei.com>

In case of error, the function devm_ioremap() returns NULL pointer not
ERR_PTR(). Use devm_ioremap_resource() instead of devm_ioremap().

Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
---
v1 -> v2: use devm_ioremap_resource()
---
 drivers/iio/adc/mxs-lradc-adc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iio/adc/mxs-lradc-adc.c b/drivers/iio/adc/mxs-lradc-adc.c
index b0c7d8e..2faf65f 100644
--- a/drivers/iio/adc/mxs-lradc-adc.c
+++ b/drivers/iio/adc/mxs-lradc-adc.c
@@ -718,7 +718,7 @@ static int mxs_lradc_adc_probe(struct platform_device *pdev)
 	adc->dev = dev;
 
 	iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	adc->base = devm_ioremap(dev, iores->start, resource_size(iores));
+	adc->base = devm_ioremap_resource(dev, iores);
 	if (IS_ERR(adc->base))
 		return PTR_ERR(adc->base);

Re: [PATCH -next v2] iio: adc: mxs-lradc: Fix return value check in mxs_lradc_adc_probe()

[Jonathan Cameron]

On 27/04/17 16:14, Wei Yongjun wrote:
> From: Wei Yongjun <weiyongjun1@huawei.com>
> 
> In case of error, the function devm_ioremap() returns NULL pointer not
> ERR_PTR(). Use devm_ioremap_resource() instead of devm_ioremap().
> 
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
I'll be wanting a tested-by for this one.

Thanks,

Jonathan
> ---
> v1 -> v2: use devm_ioremap_resource()
> ---
>  drivers/iio/adc/mxs-lradc-adc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/iio/adc/mxs-lradc-adc.c b/drivers/iio/adc/mxs-lradc-adc.c
> index b0c7d8e..2faf65f 100644
> --- a/drivers/iio/adc/mxs-lradc-adc.c
> +++ b/drivers/iio/adc/mxs-lradc-adc.c
> @@ -718,7 +718,7 @@ static int mxs_lradc_adc_probe(struct platform_device *pdev)
>  	adc->dev = dev;
>  
>  	iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> -	adc->base = devm_ioremap(dev, iores->start, resource_size(iores));
> +	adc->base = devm_ioremap_resource(dev, iores);
>  	if (IS_ERR(adc->base))
>  		return PTR_ERR(adc->base);
> 

Re: [PATCH -next v2] iio: adc: mxs-lradc: Fix return value check in mxs_lradc_adc_probe()

[Ksenija Stanojević]

Hi Wei,

On Sun, Apr 30, 2017 at 6:31 PM, Jonathan Cameron <jic23@kernel.org> wrote:
> On 27/04/17 16:14, Wei Yongjun wrote:
>> From: Wei Yongjun <weiyongjun1@huawei.com>
>>
>> In case of error, the function devm_ioremap() returns NULL pointer not
>> ERR_PTR(). Use devm_ioremap_resource() instead of devm_ioremap().
>>
>> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
> I'll be wanting a tested-by for this one.
>
> Thanks,
>
> Jonathan
>> ---
>> v1 -> v2: use devm_ioremap_resource()
>> ---
>>  drivers/iio/adc/mxs-lradc-adc.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/iio/adc/mxs-lradc-adc.c b/drivers/iio/adc/mxs-lradc-adc.c
>> index b0c7d8e..2faf65f 100644
>> --- a/drivers/iio/adc/mxs-lradc-adc.c
>> +++ b/drivers/iio/adc/mxs-lradc-adc.c
>> @@ -718,7 +718,7 @@ static int mxs_lradc_adc_probe(struct platform_device *pdev)
>>       adc->dev = dev;
>>
>>       iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>> -     adc->base = devm_ioremap(dev, iores->start, resource_size(iores));
>> +     adc->base = devm_ioremap_resource(dev, iores);
>>       if (IS_ERR(adc->base))
>>               return PTR_ERR(adc->base);
>>


I tested your patch on i.mx28 and it causes probe failure. Here's dmesg output:

[    3.065959] mxs-lradc-adc mxs-lradc-adc: can't request region for
resource [mem 0x80050000-0x80051fff]
[    3.075537] mxs-lradc-adc: probe of mxs-lradc-adc failed with error -16

Ksenija

RE: [PATCH -next v2] iio: adc: mxs-lradc: Fix return value check in mxs_lradc_adc_probe()

[weiyongjun (A)]

SGkgTGVlLA0KDQo+IA0KPiBIaSBXZWksDQo+IA0KPiBPbiBTdW4sIEFwciAzMCwgMjAxNyBhdCA2
OjMxIFBNLCBKb25hdGhhbiBDYW1lcm9uIDxqaWMyM0BrZXJuZWwub3JnPg0KPiB3cm90ZToNCj4g
PiBPbiAyNy8wNC8xNyAxNjoxNCwgV2VpIFlvbmdqdW4gd3JvdGU6DQo+ID4+IEZyb206IFdlaSBZ
b25nanVuIDx3ZWl5b25nanVuMUBodWF3ZWkuY29tPg0KPiA+Pg0KPiA+PiBJbiBjYXNlIG9mIGVy
cm9yLCB0aGUgZnVuY3Rpb24gZGV2bV9pb3JlbWFwKCkgcmV0dXJucyBOVUxMIHBvaW50ZXIgbm90
DQo+ID4+IEVSUl9QVFIoKS4gVXNlIGRldm1faW9yZW1hcF9yZXNvdXJjZSgpIGluc3RlYWQgb2Yg
ZGV2bV9pb3JlbWFwKCkuDQo+ID4+DQo+ID4+IFNpZ25lZC1vZmYtYnk6IFdlaSBZb25nanVuIDx3
ZWl5b25nanVuMUBodWF3ZWkuY29tPg0KPiA+IEknbGwgYmUgd2FudGluZyBhIHRlc3RlZC1ieSBm
b3IgdGhpcyBvbmUuDQo+ID4NCj4gPiBUaGFua3MsDQo+ID4NCj4gPiBKb25hdGhhbg0KPiA+PiAt
LS0NCj4gPj4gdjEgLT4gdjI6IHVzZSBkZXZtX2lvcmVtYXBfcmVzb3VyY2UoKQ0KPiA+PiAtLS0N
Cj4gDQo+IA0KPiBJIHRlc3RlZCB5b3VyIHBhdGNoIG9uIGkubXgyOCBhbmQgaXQgY2F1c2VzIHBy
b2JlIGZhaWx1cmUuIEhlcmUncyBkbWVzZw0KPiBvdXRwdXQ6DQo+IA0KPiBbICAgIDMuMDY1OTU5
XSBteHMtbHJhZGMtYWRjIG14cy1scmFkYy1hZGM6IGNhbid0IHJlcXVlc3QgcmVnaW9uIGZvcg0K
PiByZXNvdXJjZSBbbWVtIDB4ODAwNTAwMDAtMHg4MDA1MWZmZl0NCj4gWyAgICAzLjA3NTUzN10g
bXhzLWxyYWRjLWFkYzogcHJvYmUgb2YgbXhzLWxyYWRjLWFkYyBmYWlsZWQgd2l0aCBlcnJvciAt
MTYNCg0KDQpJdCBzZWVtcyB0aGF0IG14cy1scmFkYyBkZXZpY2VzIHNoYXJlIG1lbW9yeSByZWdp
b25zLCBhbmQgZGV2bV9pb3JlbWFwX3Jlc291cmNlDQpkb2VzIG5vdCBhbGxvdyB0byBzaGFyZSBy
ZXNvdXJjZXMgd2Ugc2hvdWxkIHN0aWxsIHVzZSBkZXZtX2lvcmVtYXAoKS4NCg0KDQpSZWdhcmRz
LA0KWW9uZ2p1biBXZWkgDQo=

[PATCH -next v3] iio: adc: mxs-lradc: Fix return value check in mxs_lradc_adc_probe()

[Wei Yongjun]

From: Wei Yongjun <weiyongjun1@huawei.com>

In case of error, the function devm_ioremap() returns NULL pointer
not ERR_PTR(). The IS_ERR() test in the return value check should
be replaced with NULL test. Also add NULL test for iores.

Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
---
v2 -> v3: use NULL test instead of devm_ioremap_resource()
---
 drivers/iio/adc/mxs-lradc-adc.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/iio/adc/mxs-lradc-adc.c b/drivers/iio/adc/mxs-lradc-adc.c
index b0c7d8e..6888167 100644
--- a/drivers/iio/adc/mxs-lradc-adc.c
+++ b/drivers/iio/adc/mxs-lradc-adc.c
@@ -718,9 +718,12 @@ static int mxs_lradc_adc_probe(struct platform_device *pdev)
 	adc->dev = dev;
 
 	iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	if (!iores)
+		return -EINVAL;
+
 	adc->base = devm_ioremap(dev, iores->start, resource_size(iores));
-	if (IS_ERR(adc->base))
-		return PTR_ERR(adc->base);
+	if (!adc->base)
+		return -ENOMEM;
 
 	init_completion(&adc->completion);
 	spin_lock_init(&adc->lock);

Re: [PATCH -next v3] iio: adc: mxs-lradc: Fix return value check in mxs_lradc_adc_probe()

[Jonathan Cameron]

On 16/05/17 16:26, Wei Yongjun wrote:
> From: Wei Yongjun <weiyongjun1@huawei.com>
> 
> In case of error, the function devm_ioremap() returns NULL pointer
> not ERR_PTR(). The IS_ERR() test in the return value check should
> be replaced with NULL test. Also add NULL test for iores.
> 
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Hi Wei,

At the moment I haven't yet sent a pull request to Greg since the
merge window closed.  Up shot is that I don't have the current version
of this code in my tree just yet.  That should be sorted in the
next week or so.  Please remind me if it looks like I have forgotten
this patch.

Thanks,

Jonathan
> ---
> v2 -> v3: use NULL test instead of devm_ioremap_resource()
> ---
>   drivers/iio/adc/mxs-lradc-adc.c | 7 +++++--
>   1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/iio/adc/mxs-lradc-adc.c b/drivers/iio/adc/mxs-lradc-adc.c
> index b0c7d8e..6888167 100644
> --- a/drivers/iio/adc/mxs-lradc-adc.c
> +++ b/drivers/iio/adc/mxs-lradc-adc.c
> @@ -718,9 +718,12 @@ static int mxs_lradc_adc_probe(struct platform_device *pdev)
>   	adc->dev = dev;
>   
>   	iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> +	if (!iores)
> +		return -EINVAL;
> +
>   	adc->base = devm_ioremap(dev, iores->start, resource_size(iores));
> -	if (IS_ERR(adc->base))
> -		return PTR_ERR(adc->base);
> +	if (!adc->base)
> +		return -ENOMEM;
>   
>   	init_completion(&adc->completion);
>   	spin_lock_init(&adc->lock);
> 

Re: [PATCH -next v3] iio: adc: mxs-lradc: Fix return value check in mxs_lradc_adc_probe()

[Jonathan Cameron]

On Sun, 21 May 2017 13:12:37 +0100
Jonathan Cameron <jic23@kernel.org> wrote:

> On 16/05/17 16:26, Wei Yongjun wrote:
> > From: Wei Yongjun <weiyongjun1@huawei.com>
> > 
> > In case of error, the function devm_ioremap() returns NULL pointer
> > not ERR_PTR(). The IS_ERR() test in the return value check should
> > be replaced with NULL test. Also add NULL test for iores.
> > 
> > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>  
> Hi Wei,
> 
> At the moment I haven't yet sent a pull request to Greg since the
> merge window closed.  Up shot is that I don't have the current version
> of this code in my tree just yet.  That should be sorted in the
> next week or so.  Please remind me if it looks like I have forgotten
> this patch.
> 
> Thanks,
> 
> Jonathan
Applied to the fixes-togreg branch of iio.git.

Thanks,

Jonathan
> > ---
> > v2 -> v3: use NULL test instead of devm_ioremap_resource()
> > ---
> >   drivers/iio/adc/mxs-lradc-adc.c | 7 +++++--
> >   1 file changed, 5 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/iio/adc/mxs-lradc-adc.c b/drivers/iio/adc/mxs-lradc-adc.c
> > index b0c7d8e..6888167 100644
> > --- a/drivers/iio/adc/mxs-lradc-adc.c
> > +++ b/drivers/iio/adc/mxs-lradc-adc.c
> > @@ -718,9 +718,12 @@ static int mxs_lradc_adc_probe(struct platform_device *pdev)
> >   	adc->dev = dev;
> >   
> >   	iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> > +	if (!iores)
> > +		return -EINVAL;
> > +
> >   	adc->base = devm_ioremap(dev, iores->start, resource_size(iores));
> > -	if (IS_ERR(adc->base))
> > -		return PTR_ERR(adc->base);
> > +	if (!adc->base)
> > +		return -ENOMEM;
> >   
> >   	init_completion(&adc->completion);
> >   	spin_lock_init(&adc->lock);
> >   
> 
> --
> 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