[PATCH] mfd: lm3533: fix return type of attribute is_visible

[PATCH] mfd: lm3533: fix return type of attribute is_visible

[Johan Hovold]

Since commit 587a1f1659 ("switch ->is_visible() to returning umode_t")
the return type of is_visible is umode_t rather than mode_t.

This silences a compiler warning on some architectures where these types
are not compatible.

Reported-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
---
 drivers/mfd/lm3533-core.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mfd/lm3533-core.c b/drivers/mfd/lm3533-core.c
index d11c891..5770bea 100644
--- a/drivers/mfd/lm3533-core.c
+++ b/drivers/mfd/lm3533-core.c
@@ -359,7 +359,7 @@ static struct attribute *lm3533_attributes[] = {
 #define to_dev_attr(_attr) \
 	container_of(_attr, struct device_attribute, attr)
 
-static mode_t lm3533_attr_is_visible(struct kobject *kobj,
+static umode_t lm3533_attr_is_visible(struct kobject *kobj,
 					     struct attribute *attr, int n)
 {
 	struct device *dev = container_of(kobj, struct device, kobj);
@@ -367,7 +367,7 @@ static mode_t lm3533_attr_is_visible(struct kobject *kobj,
 	struct device_attribute *dattr = to_dev_attr(attr);
 	struct lm3533_device_attribute *lattr = to_lm3533_dev_attr(dattr);
 	enum lm3533_attribute_type type = lattr->type;
-	mode_t mode = attr->mode;
+	umode_t mode = attr->mode;
 
 	if (!lm3533->have_backlights && type == LM3533_ATTR_TYPE_BACKLIGHT)
 		mode = 0;
-- 
1.7.8.5

Re: [PATCH] mfd: lm3533: fix return type of attribute is_visible

[Johan Hovold]

Hi Samuel,

On Fri, May 11, 2012 at 10:40:41AM +0200, Johan Hovold wrote:
> Since commit 587a1f1659 ("switch ->is_visible() to returning umode_t")
> the return type of is_visible is umode_t rather than mode_t.
> 
> This silences a compiler warning on some architectures where these types
> are not compatible.
> 
> Reported-by: Andrew Morton <akpm@linux-foundation.org>
> Signed-off-by: Johan Hovold <jhovold@gmail.com>
> ---

Apparently Dan Carpenter sent a fix for this compiler warning the day
after I submitted mine. Dan's patch, however, only fixed the return type
and not the type of the mode variable.

Could you consider applying this patch one on top of Dan's (which you
applied to mfd-next on Monday)?

Thanks,
Johan

>  drivers/mfd/lm3533-core.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/mfd/lm3533-core.c b/drivers/mfd/lm3533-core.c
> index d11c891..5770bea 100644
> --- a/drivers/mfd/lm3533-core.c
> +++ b/drivers/mfd/lm3533-core.c
> @@ -359,7 +359,7 @@ static struct attribute *lm3533_attributes[] = {
>  #define to_dev_attr(_attr) \
>  	container_of(_attr, struct device_attribute, attr)
>  
> -static mode_t lm3533_attr_is_visible(struct kobject *kobj,
> +static umode_t lm3533_attr_is_visible(struct kobject *kobj,
>  					     struct attribute *attr, int n)
>  {
>  	struct device *dev = container_of(kobj, struct device, kobj);
> @@ -367,7 +367,7 @@ static mode_t lm3533_attr_is_visible(struct kobject *kobj,
>  	struct device_attribute *dattr = to_dev_attr(attr);
>  	struct lm3533_device_attribute *lattr = to_lm3533_dev_attr(dattr);
>  	enum lm3533_attribute_type type = lattr->type;
> -	mode_t mode = attr->mode;
> +	umode_t mode = attr->mode;
>  
>  	if (!lm3533->have_backlights && type == LM3533_ATTR_TYPE_BACKLIGHT)
>  		mode = 0;

Re: [PATCH] mfd: lm3533: fix return type of attribute is_visible

[Samuel Ortiz]

Hi Johan,

On Fri, May 18, 2012 at 01:18:04PM +0200, Johan Hovold wrote:
> Hi Samuel,
> 
> On Fri, May 11, 2012 at 10:40:41AM +0200, Johan Hovold wrote:
> > Since commit 587a1f1659 ("switch ->is_visible() to returning umode_t")
> > the return type of is_visible is umode_t rather than mode_t.
> > 
> > This silences a compiler warning on some architectures where these types
> > are not compatible.
> > 
> > Reported-by: Andrew Morton <akpm@linux-foundation.org>
> > Signed-off-by: Johan Hovold <jhovold@gmail.com>
> > ---
> 
> Apparently Dan Carpenter sent a fix for this compiler warning the day
> after I submitted mine. Dan's patch, however, only fixed the return type
> and not the type of the mode variable.
> 
> Could you consider applying this patch one on top of Dan's (which you
> applied to mfd-next on Monday)?
I applied the following chunk:

@@ -367,7 +367,7 @@ static umode_t lm3533_attr_is_visible(struct kobject *kobj,
        struct device_attribute *dattr = to_dev_attr(attr);
        struct lm3533_device_attribute *lattr = to_lm3533_dev_attr(dattr);
        enum lm3533_attribute_type type = lattr->type;
-       mode_t mode = attr->mode;
+       umode_t mode = attr->mode;

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/

Re: [PATCH] mfd: lm3533: fix return type of attribute is_visible

[Johan Hovold]

On Sun, May 20, 2012 at 03:19:08PM +0200, Samuel Ortiz wrote:
> Hi Johan,
> 
> On Fri, May 18, 2012 at 01:18:04PM +0200, Johan Hovold wrote:
> > Hi Samuel,
> > 
> > On Fri, May 11, 2012 at 10:40:41AM +0200, Johan Hovold wrote:
> > > Since commit 587a1f1659 ("switch ->is_visible() to returning umode_t")
> > > the return type of is_visible is umode_t rather than mode_t.
> > > 
> > > This silences a compiler warning on some architectures where these types
> > > are not compatible.
> > > 
> > > Reported-by: Andrew Morton <akpm@linux-foundation.org>
> > > Signed-off-by: Johan Hovold <jhovold@gmail.com>
> > > ---
> > 
> > Apparently Dan Carpenter sent a fix for this compiler warning the day
> > after I submitted mine. Dan's patch, however, only fixed the return type
> > and not the type of the mode variable.
> > 
> > Could you consider applying this patch one on top of Dan's (which you
> > applied to mfd-next on Monday)?
> I applied the following chunk:
> 
> @@ -367,7 +367,7 @@ static umode_t lm3533_attr_is_visible(struct kobject *kobj,
>         struct device_attribute *dattr = to_dev_attr(attr);
>         struct lm3533_device_attribute *lattr = to_lm3533_dev_attr(dattr);
>         enum lm3533_attribute_type type = lattr->type;
> -       mode_t mode = attr->mode;
> +       umode_t mode = attr->mode;

Great. Thanks!

Johan