[PATCH 2/5] ARM: mxs-lradc: Simplify mxs_lradc_trigger_init error handle

[PATCH 2/5] ARM: mxs-lradc: Simplify mxs_lradc_trigger_init error handle

[Otavio Salvador]

As we have a 'ret' variable with the iio_trigger_register return, this
can be used as result.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 drivers/staging/iio/adc/mxs-lradc.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/iio/adc/mxs-lradc.c b/drivers/staging/iio/adc/mxs-lradc.c
index d92c97a..6d41846 100644
--- a/drivers/staging/iio/adc/mxs-lradc.c
+++ b/drivers/staging/iio/adc/mxs-lradc.c
@@ -671,14 +671,12 @@ static int mxs_lradc_trigger_init(struct iio_dev *iio)
 	trig->ops = &mxs_lradc_trigger_ops;
 
 	ret = iio_trigger_register(trig);
-	if (ret) {
+	if (ret)
 		iio_trigger_free(trig);
-		return ret;
-	}
 
 	iio->trig = trig;
 
-	return 0;
+	return ret;
 }
 
 static void mxs_lradc_trigger_remove(struct iio_dev *iio)
-- 
1.8.3.2

[PATCH 5/5] iio: add configuration option for debug support

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 drivers/iio/Kconfig  | 7 +++++++
 drivers/iio/Makefile | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig
index 9af763a..d1f06f2 100644
--- a/drivers/iio/Kconfig
+++ b/drivers/iio/Kconfig
@@ -12,6 +12,13 @@ menuconfig IIO
 
 if IIO
 
+config IIO_DEBUG
+	boolean "Debug support for Industrial I/O"
+	depends on DEBUG_KERNEL
+	help
+	  Say "yes" to enable debug messaging (like dev_dbg and pr_debug),
+	  sysfs, and debugfs support in Industrial I/O subsystem and drivers.
+
 config IIO_BUFFER
 	bool "Enable buffer support within IIO"
 	help
diff --git a/drivers/iio/Makefile b/drivers/iio/Makefile
index 7a3866c..6e43e5b 100644
--- a/drivers/iio/Makefile
+++ b/drivers/iio/Makefile
@@ -2,6 +2,8 @@
 # Makefile for the industrial I/O core.
 #
 
+ccflags-$(CONFIG_IIO_DEBUG) := -DDEBUG
+
 obj-$(CONFIG_IIO) += industrialio.o
 industrialio-y := industrialio-core.o industrialio-event.o inkern.o
 industrialio-$(CONFIG_IIO_BUFFER) += industrialio-buffer.o
-- 
1.8.3.2

Re: [PATCH 2/5] ARM: mxs-lradc: Simplify mxs_lradc_trigger_init error handle

[Marek Vasut]

Dear Otavio Salvador,

> As we have a 'ret' variable with the iio_trigger_register return, this
> can be used as result.
> 
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>  drivers/staging/iio/adc/mxs-lradc.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/staging/iio/adc/mxs-lradc.c
> b/drivers/staging/iio/adc/mxs-lradc.c index d92c97a..6d41846 100644
> --- a/drivers/staging/iio/adc/mxs-lradc.c
> +++ b/drivers/staging/iio/adc/mxs-lradc.c
> @@ -671,14 +671,12 @@ static int mxs_lradc_trigger_init(struct iio_dev
> *iio) trig->ops = &mxs_lradc_trigger_ops;
> 
>  	ret = iio_trigger_register(trig);
> -	if (ret) {
> +	if (ret)
>  		iio_trigger_free(trig);
> -		return ret;
> -	}
> 
>  	iio->trig = trig;


You are still setting iio->trig , you dont want to do that in case of failure

> -	return 0;
> +	return ret;
>  }
> 
>  static void mxs_lradc_trigger_remove(struct iio_dev *iio)

Best regards,
Marek Vasut

Re: [PATCH 2/5] ARM: mxs-lradc: Simplify mxs_lradc_trigger_init error handle

[Otavio Salvador]

On Mon, Jul 15, 2013 at 11:24 AM, Marek Vasut <marek.vasut@gmail.com> wrote:
> Dear Otavio Salvador,
>
>> As we have a 'ret' variable with the iio_trigger_register return, this
>> can be used as result.
>>
>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>> ---
>>  drivers/staging/iio/adc/mxs-lradc.c | 6 ++----
>>  1 file changed, 2 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/staging/iio/adc/mxs-lradc.c
>> b/drivers/staging/iio/adc/mxs-lradc.c index d92c97a..6d41846 100644
>> --- a/drivers/staging/iio/adc/mxs-lradc.c
>> +++ b/drivers/staging/iio/adc/mxs-lradc.c
>> @@ -671,14 +671,12 @@ static int mxs_lradc_trigger_init(struct iio_dev
>> *iio) trig->ops = &mxs_lradc_trigger_ops;
>>
>>       ret = iio_trigger_register(trig);
>> -     if (ret) {
>> +     if (ret)
>>               iio_trigger_free(trig);
>> -             return ret;
>> -     }
>>
>>       iio->trig = trig;
>
>
> You are still setting iio->trig , you dont want to do that in case of failure

In this case it'd end being NULL I think, wouldn't it?

--
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://projetos.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [PATCH 2/5] ARM: mxs-lradc: Simplify mxs_lradc_trigger_init error handle

[Marek Vasut]

Dear Otavio Salvador,

> On Mon, Jul 15, 2013 at 11:24 AM, Marek Vasut <marek.vasut@gmail.com> wrote:
> > Dear Otavio Salvador,
> > 
> >> As we have a 'ret' variable with the iio_trigger_register return, this
> >> can be used as result.
> >> 
> >> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> >> ---
> >> 
> >>  drivers/staging/iio/adc/mxs-lradc.c | 6 ++----
> >>  1 file changed, 2 insertions(+), 4 deletions(-)
> >> 
> >> diff --git a/drivers/staging/iio/adc/mxs-lradc.c
> >> b/drivers/staging/iio/adc/mxs-lradc.c index d92c97a..6d41846 100644
> >> --- a/drivers/staging/iio/adc/mxs-lradc.c
> >> +++ b/drivers/staging/iio/adc/mxs-lradc.c
> >> @@ -671,14 +671,12 @@ static int mxs_lradc_trigger_init(struct iio_dev
> >> *iio) trig->ops = &mxs_lradc_trigger_ops;
> >> 
> >>       ret = iio_trigger_register(trig);
> >> 
> >> -     if (ret) {
> >> +     if (ret)
> >> 
> >>               iio_trigger_free(trig);
> >> 
> >> -             return ret;
> >> -     }
> >> 
> >>       iio->trig = trig;
> > 
> > You are still setting iio->trig , you dont want to do that in case of
> > failure
> 
> In this case it'd end being NULL I think, wouldn't it?

It won't, see the implementation in:

drivers/iio/industrialio-trigger.c

Best regards,
Marek Vasut

Re: [PATCH 5/5] iio: add configuration option for debug support

[Jonathan Cameron]

On 07/15/2013 03:22 PM, Otavio Salvador wrote:
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
seems a sensible facility to have available.

Applied to the togreg branch of iio.git
> ---
>  drivers/iio/Kconfig  | 7 +++++++
>  drivers/iio/Makefile | 2 ++
>  2 files changed, 9 insertions(+)
> 
> diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig
> index 9af763a..d1f06f2 100644
> --- a/drivers/iio/Kconfig
> +++ b/drivers/iio/Kconfig
> @@ -12,6 +12,13 @@ menuconfig IIO
>  
>  if IIO
>  
> +config IIO_DEBUG
> +	boolean "Debug support for Industrial I/O"
> +	depends on DEBUG_KERNEL
> +	help
> +	  Say "yes" to enable debug messaging (like dev_dbg and pr_debug),
> +	  sysfs, and debugfs support in Industrial I/O subsystem and drivers.
> +
>  config IIO_BUFFER
>  	bool "Enable buffer support within IIO"
>  	help
> diff --git a/drivers/iio/Makefile b/drivers/iio/Makefile
> index 7a3866c..6e43e5b 100644
> --- a/drivers/iio/Makefile
> +++ b/drivers/iio/Makefile
> @@ -2,6 +2,8 @@
>  # Makefile for the industrial I/O core.
>  #
>  
> +ccflags-$(CONFIG_IIO_DEBUG) := -DDEBUG
> +
>  obj-$(CONFIG_IIO) += industrialio.o
>  industrialio-y := industrialio-core.o industrialio-event.o inkern.o
>  industrialio-$(CONFIG_IIO_BUFFER) += industrialio-buffer.o
> 

Re: [PATCH 5/5] iio: add configuration option for debug support

[Lars-Peter Clausen]

On 07/16/2013 11:58 AM, Jonathan Cameron wrote:
> On 07/15/2013 03:22 PM, Otavio Salvador wrote:
>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> seems a sensible facility to have available.
> 
> Applied to the togreg branch of iio.git

Can you update the Kconfig help text?

>> ---
>>  drivers/iio/Kconfig  | 7 +++++++
>>  drivers/iio/Makefile | 2 ++
>>  2 files changed, 9 insertions(+)
>>
>> diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig
>> index 9af763a..d1f06f2 100644
>> --- a/drivers/iio/Kconfig
>> +++ b/drivers/iio/Kconfig
>> @@ -12,6 +12,13 @@ menuconfig IIO
>>  
>>  if IIO
>>  
>> +config IIO_DEBUG
>> +	boolean "Debug support for Industrial I/O"
>> +	depends on DEBUG_KERNEL
>> +	help
>> +	  Say "yes" to enable debug messaging (like dev_dbg and pr_debug),
>> +	  sysfs, and debugfs support in Industrial I/O subsystem and drivers.

This has nothing to do with either sysfs or debugfs support.

>> +
>>  config IIO_BUFFER
>>  	bool "Enable buffer support within IIO"
>>  	help
>> diff --git a/drivers/iio/Makefile b/drivers/iio/Makefile
>> index 7a3866c..6e43e5b 100644
>> --- a/drivers/iio/Makefile
>> +++ b/drivers/iio/Makefile
>> @@ -2,6 +2,8 @@
>>  # Makefile for the industrial I/O core.
>>  #
>>  
>> +ccflags-$(CONFIG_IIO_DEBUG) := -DDEBUG
>> +
>>  obj-$(CONFIG_IIO) += industrialio.o
>>  industrialio-y := industrialio-core.o industrialio-event.o inkern.o
>>  industrialio-$(CONFIG_IIO_BUFFER) += industrialio-buffer.o
>>
> --
> 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 5/5] iio: add configuration option for debug support

[Otavio Salvador]

On Tue, Jul 16, 2013 at 7:26 AM, Lars-Peter Clausen <lars@metafoo.de> wrote:
> On 07/16/2013 11:58 AM, Jonathan Cameron wrote:
>> On 07/15/2013 03:22 PM, Otavio Salvador wrote:
>>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>> seems a sensible facility to have available.
>>
>> Applied to the togreg branch of iio.git
>
> Can you update the Kconfig help text?

Sure I can. Jonathan seem to have applied it so should I send a v2 or
a new patch?

>>> ---
>>>  drivers/iio/Kconfig  | 7 +++++++
>>>  drivers/iio/Makefile | 2 ++
>>>  2 files changed, 9 insertions(+)
>>>
>>> diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig
>>> index 9af763a..d1f06f2 100644
>>> --- a/drivers/iio/Kconfig
>>> +++ b/drivers/iio/Kconfig
>>> @@ -12,6 +12,13 @@ menuconfig IIO
>>>
>>>  if IIO
>>>
>>> +config IIO_DEBUG
>>> +    boolean "Debug support for Industrial I/O"
>>> +    depends on DEBUG_KERNEL
>>> +    help
>>> +      Say "yes" to enable debug messaging (like dev_dbg and pr_debug),
>>> +      sysfs, and debugfs support in Industrial I/O subsystem and drivers.
>
> This has nothing to do with either sysfs or debugfs support.

     Say "yes" to enable debug messaging (like dev_dbg and pr_debug)
     support in Industrial I/O subsystem and drivers.

?

--
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://projetos.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [PATCH 5/5] iio: add configuration option for debug support

[Lars-Peter Clausen]

On 07/16/2013 02:01 PM, Otavio Salvador wrote:
> On Tue, Jul 16, 2013 at 7:26 AM, Lars-Peter Clausen <lars@metafoo.de> wrote:
>> On 07/16/2013 11:58 AM, Jonathan Cameron wrote:
>>> On 07/15/2013 03:22 PM, Otavio Salvador wrote:
>>>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>>> seems a sensible facility to have available.
>>>
>>> Applied to the togreg branch of iio.git
>>
>> Can you update the Kconfig help text?
> 
> Sure I can. Jonathan seem to have applied it so should I send a v2 or
> a new patch?
> 

He hasn't pushed things out yet, I think a v2 will be fine.

>>>> ---
>>>>  drivers/iio/Kconfig  | 7 +++++++
>>>>  drivers/iio/Makefile | 2 ++
>>>>  2 files changed, 9 insertions(+)
>>>>
>>>> diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig
>>>> index 9af763a..d1f06f2 100644
>>>> --- a/drivers/iio/Kconfig
>>>> +++ b/drivers/iio/Kconfig
>>>> @@ -12,6 +12,13 @@ menuconfig IIO
>>>>
>>>>  if IIO
>>>>
>>>> +config IIO_DEBUG
>>>> +    boolean "Debug support for Industrial I/O"
>>>> +    depends on DEBUG_KERNEL
>>>> +    help
>>>> +      Say "yes" to enable debug messaging (like dev_dbg and pr_debug),
>>>> +      sysfs, and debugfs support in Industrial I/O subsystem and drivers.
>>
>> This has nothing to do with either sysfs or debugfs support.
> 
>      Say "yes" to enable debug messaging (like dev_dbg and pr_debug)
>      support in Industrial I/O subsystem and drivers.
> 
> ?
> 
> --
> Otavio Salvador                             O.S. Systems
> http://www.ossystems.com.br        http://projetos.ossystems.com.br
> Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750
> 

Re: [PATCH 2/5] ARM: mxs-lradc: Simplify mxs_lradc_trigger_init error handle

[Otavio Salvador]

On Mon, Jul 15, 2013 at 8:00 PM, Marek Vasut <marex@denx.de> wrote:
> Dear Otavio Salvador,
>
>> On Mon, Jul 15, 2013 at 11:24 AM, Marek Vasut <marek.vasut@gmail.com> wrote:
>> > Dear Otavio Salvador,
>> >
>> >> As we have a 'ret' variable with the iio_trigger_register return, this
>> >> can be used as result.
>> >>
>> >> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>> >> ---
>> >>
>> >>  drivers/staging/iio/adc/mxs-lradc.c | 6 ++----
>> >>  1 file changed, 2 insertions(+), 4 deletions(-)
>> >>
>> >> diff --git a/drivers/staging/iio/adc/mxs-lradc.c
>> >> b/drivers/staging/iio/adc/mxs-lradc.c index d92c97a..6d41846 100644
>> >> --- a/drivers/staging/iio/adc/mxs-lradc.c
>> >> +++ b/drivers/staging/iio/adc/mxs-lradc.c
>> >> @@ -671,14 +671,12 @@ static int mxs_lradc_trigger_init(struct iio_dev
>> >> *iio) trig->ops = &mxs_lradc_trigger_ops;
>> >>
>> >>       ret = iio_trigger_register(trig);
>> >>
>> >> -     if (ret) {
>> >> +     if (ret)
>> >>
>> >>               iio_trigger_free(trig);
>> >>
>> >> -             return ret;
>> >> -     }
>> >>
>> >>       iio->trig = trig;
>> >
>> > You are still setting iio->trig , you dont want to do that in case of
>> > failure
>>
>> In this case it'd end being NULL I think, wouldn't it?
>
> It won't, see the implementation in:
>
> drivers/iio/industrialio-trigger.c

Agreed; will drop this from v2.

--
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://projetos.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [PATCH 5/5] iio: add configuration option for debug support

[Jonathan Cameron]

Lars-Peter Clausen <lars@metafoo.de> wrote:
>On 07/16/2013 11:58 AM, Jonathan Cameron wrote:
>> On 07/15/2013 03:22 PM, Otavio Salvador wrote:
>>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>> seems a sensible facility to have available.
>> 
>> Applied to the togreg branch of iio.git
>
>Can you update the Kconfig help text?

Good point. Will fix!
>
>>> ---
>>>  drivers/iio/Kconfig  | 7 +++++++
>>>  drivers/iio/Makefile | 2 ++
>>>  2 files changed, 9 insertions(+)
>>>
>>> diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig
>>> index 9af763a..d1f06f2 100644
>>> --- a/drivers/iio/Kconfig
>>> +++ b/drivers/iio/Kconfig
>>> @@ -12,6 +12,13 @@ menuconfig IIO
>>>  
>>>  if IIO
>>>  
>>> +config IIO_DEBUG
>>> +	boolean "Debug support for Industrial I/O"
>>> +	depends on DEBUG_KERNEL
>>> +	help
>>> +	  Say "yes" to enable debug messaging (like dev_dbg and pr_debug),
>>> +	  sysfs, and debugfs support in Industrial I/O subsystem and
>drivers.
>
>This has nothing to do with either sysfs or debugfs support.
>
>>> +
>>>  config IIO_BUFFER
>>>  	bool "Enable buffer support within IIO"
>>>  	help
>>> diff --git a/drivers/iio/Makefile b/drivers/iio/Makefile
>>> index 7a3866c..6e43e5b 100644
>>> --- a/drivers/iio/Makefile
>>> +++ b/drivers/iio/Makefile
>>> @@ -2,6 +2,8 @@
>>>  # Makefile for the industrial I/O core.
>>>  #
>>>  
>>> +ccflags-$(CONFIG_IIO_DEBUG) := -DDEBUG
>>> +
>>>  obj-$(CONFIG_IIO) += industrialio.o
>>>  industrialio-y := industrialio-core.o industrialio-event.o inkern.o
>>>  industrialio-$(CONFIG_IIO_BUFFER) += industrialio-buffer.o
>>>
>> --
>> 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
>> 

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

Re: [PATCH 5/5] iio: add configuration option for debug support

[Jonathan Cameron]

Lars-Peter Clausen <lars@metafoo.de> wrote:
>On 07/16/2013 02:01 PM, Otavio Salvador wrote:
>> On Tue, Jul 16, 2013 at 7:26 AM, Lars-Peter Clausen <lars@metafoo.de>
>wrote:
>>> On 07/16/2013 11:58 AM, Jonathan Cameron wrote:
>>>> On 07/15/2013 03:22 PM, Otavio Salvador wrote:
>>>>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>>>> seems a sensible facility to have available.
>>>>
>>>> Applied to the togreg branch of iio.git
>>>
>>> Can you update the Kconfig help text?
>> 
>> Sure I can. Jonathan seem to have applied it so should I send a v2 or
>> a new patch?
>> 
>
>He hasn't pushed things out yet, I think a v2 will be fine.
>

Yup a v2 is fine.  Actually I regularly rebase this tree and it may eat babies! All work more or less should be against Greg's staging/staging-next tree as that is nice and non debasing.
>>>>> ---
>>>>>  drivers/iio/Kconfig  | 7 +++++++
>>>>>  drivers/iio/Makefile | 2 ++
>>>>>  2 files changed, 9 insertions(+)
>>>>>
>>>>> diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig
>>>>> index 9af763a..d1f06f2 100644
>>>>> --- a/drivers/iio/Kconfig
>>>>> +++ b/drivers/iio/Kconfig
>>>>> @@ -12,6 +12,13 @@ menuconfig IIO
>>>>>
>>>>>  if IIO
>>>>>
>>>>> +config IIO_DEBUG
>>>>> +    boolean "Debug support for Industrial I/O"
>>>>> +    depends on DEBUG_KERNEL
>>>>> +    help
>>>>> +      Say "yes" to enable debug messaging (like dev_dbg and
>pr_debug),
>>>>> +      sysfs, and debugfs support in Industrial I/O subsystem and
>drivers.
>>>
>>> This has nothing to do with either sysfs or debugfs support.
>> 
>>      Say "yes" to enable debug messaging (like dev_dbg and pr_debug)
>>      support in Industrial I/O subsystem and drivers.
>> 
>> ?
>> 
>> --
>> Otavio Salvador                             O.S. Systems
>> http://www.ossystems.com.br        http://projetos.ossystems.com.br
>> Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750
>> 
>
>--
>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

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