2010-07-06 15:28:19

by Kulikov Vasiliy

Subject: [PATCH] enclosure: fix lost return

Useless statement must be return with argument.

This patch silences a compiler warning:
drivers/misc/enclosure.c: In function ‘enclosure_component_register’:
drivers/misc/enclosure.c:289: warning: ignoring return value of ‘ERR_PTR’, declared with attribute warn_unused_result

Signed-off-by: Kulikov Vasiliy <[email protected]>
---
drivers/misc/enclosure.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/misc/enclosure.c b/drivers/misc/enclosure.c
index 48c84a5..9ae7bef 100644
--- a/drivers/misc/enclosure.c
+++ b/drivers/misc/enclosure.c
@@ -286,7 +286,7 @@ enclosure_component_register(struct enclosure_device *edev,

err = device_register(cdev);
if (err)
- ERR_PTR(err);
+ return ERR_PTR(err);

return ecomp;
}
--
1.7.0.4

2010-07-06 15:39:27

by James Bottomley

Subject: Re: [PATCH] enclosure: fix lost return

On Tue, 2010-07-06 at 19:28 +0400, Kulikov Vasiliy wrote:
> Useless statement must be return with argument.
>
> This patch silences a compiler warning:
> drivers/misc/enclosure.c: In function ‘enclosure_component_register’:
> drivers/misc/enclosure.c:289: warning: ignoring return value of ‘ERR_PTR’, declared with attribute warn_unused_result
>
> Signed-off-by: Kulikov Vasiliy <[email protected]>
> ---
> drivers/misc/enclosure.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/misc/enclosure.c b/drivers/misc/enclosure.c
> index 48c84a5..9ae7bef 100644
> --- a/drivers/misc/enclosure.c
> +++ b/drivers/misc/enclosure.c
> @@ -286,7 +286,7 @@ enclosure_component_register(struct enclosure_device *edev,
>
> err = device_register(cdev);
> if (err)
> - ERR_PTR(err);
> + return ERR_PTR(err);

Well, the patch isn't quite correct, but I think I win a prize for
working out what the correct patch was and then forgetting to apply it:

http://marc.info/?l=linux-scsi&m=126843630320666

I've actually put it in my tree this time ...

James