lkml.org 
[lkml]   [2010]   [Nov]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] cs5535-mfd: fix warning on x86-64
On Mon, 29 Nov 2010 11:52:57 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Samuel,
>
> After merging the mfd tree, today's linux-next build (x86_64
> allmodconfig) produced this warning:
>
> drivers/mfd/cs5535-mfd.c: In function 'cs5535_mfd_probe':
> drivers/mfd/cs5535-mfd.c:106: warning: format '%d' expects type
> 'int', but argument 3 has type 'long unsigned int'
>

Ick, ARRAY_SIZE is unsigned int on x86, unsigned long on x86-64. The
patch below fixes this.




From: Andres Salomon <dilinger@queued.net>

ARRAY_SIZE() returns unsigned long on x86-64 (rather than unsigned int);
cast it to the desired type to shut gcc up.

Signed-off-by: Andres Salomon <dilinger@queued.net>
---
drivers/mfd/cs5535-mfd.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mfd/cs5535-mfd.c b/drivers/mfd/cs5535-mfd.c
index b141ca7..e6f7ebc 100644
--- a/drivers/mfd/cs5535-mfd.c
+++ b/drivers/mfd/cs5535-mfd.c
@@ -103,8 +103,8 @@ static int __devinit cs5535_mfd_probe(struct pci_dev *pdev,
goto err_disable;
}

- dev_info(&pdev->dev, "%d devices registered.\n",
- ARRAY_SIZE(cs5535_mfd_cells));
+ dev_info(&pdev->dev, "%u devices registered.\n",
+ (unsigned int) ARRAY_SIZE(cs5535_mfd_cells));

return 0;

--
1.7.2.3
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2010-11-30 05:47    [W:0.071 / U:4.924 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site