* [PATCH] ARM: OMAP: Fix warnings in ads7846
@ 2006-10-27 16:32 Dirk Behme
0 siblings, 0 replies; 3+ messages in thread
From: Dirk Behme @ 2006-10-27 16:32 UTC (permalink / raw)
To: linux-omap-open-source
[-- Attachment #1: Type: text/plain, Size: 175 bytes --]
Fix various warnings
warning: ignoring return value of 'device_create_file',
declared with attribute warn_unused_result
Signed-off-by: Dirk Behme <dirk.behme_at_gmail.com>
[-- Attachment #2: ads7846_warning_patch.txt --]
[-- Type: text/plain, Size: 2404 bytes --]
Index: linux-osk/drivers/input/touchscreen/ads7846.c
===================================================================
--- linux-osk.orig/drivers/input/touchscreen/ads7846.c
+++ linux-osk/drivers/input/touchscreen/ads7846.c
@@ -916,36 +916,54 @@ static int __devinit ads7846_probe(struc
* use the other ADC lines a bit differently too
*/
if (ts->model == 7846) {
- device_create_file(&spi->dev, &dev_attr_temp0);
- device_create_file(&spi->dev, &dev_attr_temp1);
+ err = device_create_file(&spi->dev, &dev_attr_temp0);
+ if (unlikely(err))
+ goto err_remove_attr7;
+ err = device_create_file(&spi->dev, &dev_attr_temp1);
+ if (unlikely(err))
+ goto err_remove_attr6;
}
/* in1 == vBAT (7846), or a non-scaled ADC input */
- if (ts->model != 7845)
- device_create_file(&spi->dev, &dev_attr_in1_input);
+ if (ts->model != 7845) {
+ err = device_create_file(&spi->dev, &dev_attr_in1_input);
+ if (unlikely(err))
+ goto err_remove_attr5;
+ }
/* in0 == a non-scaled ADC input */
- device_create_file(&spi->dev, &dev_attr_in0_input);
+ err = device_create_file(&spi->dev, &dev_attr_in0_input);
+ if (unlikely(err))
+ goto err_remove_attr4;
/* non-hwmon device attributes */
- device_create_file(&spi->dev, &dev_attr_pen_down);
- device_create_file(&spi->dev, &dev_attr_disable);
+ err = device_create_file(&spi->dev, &dev_attr_pen_down);
+ if (unlikely(err))
+ goto err_remove_attr3;
+ err = device_create_file(&spi->dev, &dev_attr_disable);
+ if (unlikely(err))
+ goto err_remove_attr2;
err = input_register_device(input_dev);
- if (err)
- goto err_remove_attr;
+ if (unlikely(err))
+ goto err_remove_attr1;
return 0;
- err_remove_attr:
+ err_remove_attr1:
device_remove_file(&spi->dev, &dev_attr_disable);
+ err_remove_attr2:
device_remove_file(&spi->dev, &dev_attr_pen_down);
+ err_remove_attr3:
+ device_remove_file(&spi->dev, &dev_attr_in0_input);
+ err_remove_attr4:
+ if (ts->model != 7845)
+ device_remove_file(&spi->dev, &dev_attr_in1_input);
+ err_remove_attr5:
if (ts->model == 7846) {
device_remove_file(&spi->dev, &dev_attr_temp1);
+ err_remove_attr6:
device_remove_file(&spi->dev, &dev_attr_temp0);
}
- if (ts->model != 7845)
- device_remove_file(&spi->dev, &dev_attr_in1_input);
- device_remove_file(&spi->dev, &dev_attr_in0_input);
-
+ err_remove_attr7:
free_irq(spi->irq, ts);
err_cleanup_filter:
if (ts->filter_cleanup)
[-- Attachment #3: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] ARM: OMAP: Fix warnings in ads7846
@ 2006-11-04 15:50 Dirk Behme
2006-11-09 23:26 ` Tony Lindgren
0 siblings, 1 reply; 3+ messages in thread
From: Dirk Behme @ 2006-11-04 15:50 UTC (permalink / raw)
To: linux-omap-open-source
[-- Attachment #1: Type: text/plain, Size: 175 bytes --]
Fix various warnings
warning: ignoring return value of 'device_create_file',
declared with attribute warn_unused_result
Signed-off-by: Dirk Behme <dirk.behme_at_gmail.com>
[-- Attachment #2: ads7846_warning_patch.txt --]
[-- Type: text/plain, Size: 2323 bytes --]
Index: linux-osk/drivers/input/touchscreen/ads7846.c
===================================================================
--- linux-osk.orig/drivers/input/touchscreen/ads7846.c
+++ linux-osk/drivers/input/touchscreen/ads7846.c
@@ -916,36 +916,54 @@ static int __devinit ads7846_probe(struc
* use the other ADC lines a bit differently too
*/
if (ts->model == 7846) {
- device_create_file(&spi->dev, &dev_attr_temp0);
- device_create_file(&spi->dev, &dev_attr_temp1);
+ err = device_create_file(&spi->dev, &dev_attr_temp0);
+ if (err)
+ goto err_remove_attr7;
+ err = device_create_file(&spi->dev, &dev_attr_temp1);
+ if (err)
+ goto err_remove_attr6;
}
/* in1 == vBAT (7846), or a non-scaled ADC input */
- if (ts->model != 7845)
- device_create_file(&spi->dev, &dev_attr_in1_input);
+ if (ts->model != 7845) {
+ err = device_create_file(&spi->dev, &dev_attr_in1_input);
+ if (err)
+ goto err_remove_attr5;
+ }
/* in0 == a non-scaled ADC input */
- device_create_file(&spi->dev, &dev_attr_in0_input);
+ err = device_create_file(&spi->dev, &dev_attr_in0_input);
+ if (err)
+ goto err_remove_attr4;
/* non-hwmon device attributes */
- device_create_file(&spi->dev, &dev_attr_pen_down);
- device_create_file(&spi->dev, &dev_attr_disable);
+ err = device_create_file(&spi->dev, &dev_attr_pen_down);
+ if (err)
+ goto err_remove_attr3;
+ err = device_create_file(&spi->dev, &dev_attr_disable);
+ if (err)
+ goto err_remove_attr2;
err = input_register_device(input_dev);
if (err)
- goto err_remove_attr;
+ goto err_remove_attr1;
return 0;
- err_remove_attr:
+ err_remove_attr1:
device_remove_file(&spi->dev, &dev_attr_disable);
+ err_remove_attr2:
device_remove_file(&spi->dev, &dev_attr_pen_down);
+ err_remove_attr3:
+ device_remove_file(&spi->dev, &dev_attr_in0_input);
+ err_remove_attr4:
+ if (ts->model != 7845)
+ device_remove_file(&spi->dev, &dev_attr_in1_input);
+ err_remove_attr5:
if (ts->model == 7846) {
device_remove_file(&spi->dev, &dev_attr_temp1);
+ err_remove_attr6:
device_remove_file(&spi->dev, &dev_attr_temp0);
}
- if (ts->model != 7845)
- device_remove_file(&spi->dev, &dev_attr_in1_input);
- device_remove_file(&spi->dev, &dev_attr_in0_input);
-
+ err_remove_attr7:
free_irq(spi->irq, ts);
err_cleanup_filter:
if (ts->filter_cleanup)
[-- Attachment #3: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ARM: OMAP: Fix warnings in ads7846
2006-11-04 15:50 Dirk Behme
@ 2006-11-09 23:26 ` Tony Lindgren
0 siblings, 0 replies; 3+ messages in thread
From: Tony Lindgren @ 2006-11-09 23:26 UTC (permalink / raw)
To: Dirk Behme; +Cc: linux-omap-open-source
* Dirk Behme <dirk.behme@googlemail.com> [061104 17:51]:
> Fix various warnings
>
> warning: ignoring return value of 'device_create_file',
> declared with attribute warn_unused_result
Pushing today.
Tony
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2006-11-09 23:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-10-27 16:32 [PATCH] ARM: OMAP: Fix warnings in ads7846 Dirk Behme
-- strict thread matches above, loose matches on Subject: below --
2006-11-04 15:50 Dirk Behme
2006-11-09 23:26 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox