diff mbox

twl4030_charger: fix warnings

Message ID 1307101391-10898-1-git-send-email-notasas@gmail.com (mailing list archive)
State Awaiting Upstream, archived
Delegated to: Tony Lindgren
Headers show

Commit Message

Grazvydas Ignotas June 3, 2011, 11:43 a.m. UTC 
Fix warnings emitted by some versions of gcc:
drivers/power/twl4030_charger.c:490: warning: overflow in implicit constant conversion
drivers/power/twl4030_charger.c:498: warning: overflow in implicit constant conversion

While at it, also fix module_param permissions and a typo in my name.

Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
---
 drivers/power/twl4030_charger.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Comments

Anton Vorontsov July 8, 2011, 1:08 p.m. UTC | #1 
On Fri, Jun 03, 2011 at 02:43:11PM +0300, Grazvydas Ignotas wrote:
> Fix warnings emitted by some versions of gcc:
> drivers/power/twl4030_charger.c:490: warning: overflow in implicit constant conversion
> drivers/power/twl4030_charger.c:498: warning: overflow in implicit constant conversion
> 
> While at it, also fix module_param permissions and a typo in my name.
> 
> Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
> ---

Applied, thanks.

I also added Jean's sign-off for the module_param persmissions
fix.

>  drivers/power/twl4030_charger.c |   10 +++++-----
>  1 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/power/twl4030_charger.c b/drivers/power/twl4030_charger.c
> index 92c16e1..54b9198 100644
> --- a/drivers/power/twl4030_charger.c
> +++ b/drivers/power/twl4030_charger.c
> @@ -62,7 +62,7 @@
>  #define TWL4030_MSTATEC_COMPLETE4	0x0e
>  
>  static bool allow_usb;
> -module_param(allow_usb, bool, 1);
> +module_param(allow_usb, bool, 0644);
>  MODULE_PARM_DESC(allow_usb, "Allow USB charge drawing default current");
>  
>  struct twl4030_bci {
> @@ -425,7 +425,7 @@ static int __init twl4030_bci_probe(struct platform_device *pdev)
>  {
>  	struct twl4030_bci *bci;
>  	int ret;
> -	int reg;
> +	u32 reg;
>  
>  	bci = kzalloc(sizeof(*bci), GFP_KERNEL);
>  	if (bci == NULL)
> @@ -486,7 +486,7 @@ static int __init twl4030_bci_probe(struct platform_device *pdev)
>  	}
>  
>  	/* Enable interrupts now. */
> -	reg = ~(TWL4030_ICHGLOW | TWL4030_ICHGEOC | TWL4030_TBATOR2 |
> +	reg = ~(u32)(TWL4030_ICHGLOW | TWL4030_ICHGEOC | TWL4030_TBATOR2 |
>  		TWL4030_TBATOR1 | TWL4030_BATSTS);
>  	ret = twl_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, reg,
>  			       TWL4030_INTERRUPTS_BCIIMR1A);
> @@ -495,7 +495,7 @@ static int __init twl4030_bci_probe(struct platform_device *pdev)
>  		goto fail_unmask_interrupts;
>  	}
>  
> -	reg = ~(TWL4030_VBATOV | TWL4030_VBUSOV | TWL4030_ACCHGOV);
> +	reg = ~(u32)(TWL4030_VBATOV | TWL4030_VBUSOV | TWL4030_ACCHGOV);
>  	ret = twl_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, reg,
>  			       TWL4030_INTERRUPTS_BCIIMR2A);
>  	if (ret < 0)
> @@ -572,7 +572,7 @@ static void __exit twl4030_bci_exit(void)
>  }
>  module_exit(twl4030_bci_exit);
>  
> -MODULE_AUTHOR("Gražydas Ignotas");
> +MODULE_AUTHOR("Gražvydas Ignotas");
>  MODULE_DESCRIPTION("TWL4030 Battery Charger Interface driver");
>  MODULE_LICENSE("GPL");
>  MODULE_ALIAS("platform:twl4030_bci");
> -- 
> 1.7.0.4
>
diff mbox

Patch

diff --git a/drivers/power/twl4030_charger.c b/drivers/power/twl4030_charger.c
index 92c16e1..54b9198 100644
--- a/drivers/power/twl4030_charger.c
+++ b/drivers/power/twl4030_charger.c
@@ -62,7 +62,7 @@ 
 #define TWL4030_MSTATEC_COMPLETE4	0x0e
 
 static bool allow_usb;
-module_param(allow_usb, bool, 1);
+module_param(allow_usb, bool, 0644);
 MODULE_PARM_DESC(allow_usb, "Allow USB charge drawing default current");
 
 struct twl4030_bci {
@@ -425,7 +425,7 @@  static int __init twl4030_bci_probe(struct platform_device *pdev)
 {
 	struct twl4030_bci *bci;
 	int ret;
-	int reg;
+	u32 reg;
 
 	bci = kzalloc(sizeof(*bci), GFP_KERNEL);
 	if (bci == NULL)
@@ -486,7 +486,7 @@  static int __init twl4030_bci_probe(struct platform_device *pdev)
 	}
 
 	/* Enable interrupts now. */
-	reg = ~(TWL4030_ICHGLOW | TWL4030_ICHGEOC | TWL4030_TBATOR2 |
+	reg = ~(u32)(TWL4030_ICHGLOW | TWL4030_ICHGEOC | TWL4030_TBATOR2 |
 		TWL4030_TBATOR1 | TWL4030_BATSTS);
 	ret = twl_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, reg,
 			       TWL4030_INTERRUPTS_BCIIMR1A);
@@ -495,7 +495,7 @@  static int __init twl4030_bci_probe(struct platform_device *pdev)
 		goto fail_unmask_interrupts;
 	}
 
-	reg = ~(TWL4030_VBATOV | TWL4030_VBUSOV | TWL4030_ACCHGOV);
+	reg = ~(u32)(TWL4030_VBATOV | TWL4030_VBUSOV | TWL4030_ACCHGOV);
 	ret = twl_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, reg,
 			       TWL4030_INTERRUPTS_BCIIMR2A);
 	if (ret < 0)
@@ -572,7 +572,7 @@  static void __exit twl4030_bci_exit(void)
 }
 module_exit(twl4030_bci_exit);
 
-MODULE_AUTHOR("Gražydas Ignotas");
+MODULE_AUTHOR("Gražvydas Ignotas");
 MODULE_DESCRIPTION("TWL4030 Battery Charger Interface driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:twl4030_bci");