[PATCH 1/2] mfd: jz4740-adc: Include linux/io.h

[PATCH 1/2] mfd: jz4740-adc: Include linux/io.h

[Axel Lin]

Include linux/io.h to fix below build error:

  CC      drivers/mfd/jz4740-adc.o
drivers/mfd/jz4740-adc.c: In function 'jz4740_adc_irq_demux':
drivers/mfd/jz4740-adc.c:73: error: implicit declaration of function 'readb'
drivers/mfd/jz4740-adc.c: In function 'jz4740_adc_set_enabled':
drivers/mfd/jz4740-adc.c:110: error: implicit declaration of function 'writeb'
drivers/mfd/jz4740-adc.c: In function 'jz4740_adc_set_config':
drivers/mfd/jz4740-adc.c:146: error: implicit declaration of function 'readl'
drivers/mfd/jz4740-adc.c:151: error: implicit declaration of function 'writel'
drivers/mfd/jz4740-adc.c: In function 'jz4740_adc_probe':
drivers/mfd/jz4740-adc.c:249: error: implicit declaration of function 'ioremap_nocache'
drivers/mfd/jz4740-adc.c:249: warning: assignment makes pointer from integer without a cast
drivers/mfd/jz4740-adc.c:289: warning: passing argument 3 of 'mfd_add_devices' discards qualifiers from pointer target type
include/linux/mfd/core.h:93: note: expected 'struct mfd_cell *' but argument is of type 'const struct mfd_cell *'
drivers/mfd/jz4740-adc.c:299: error: implicit declaration of function 'iounmap'
make[2]: *** [drivers/mfd/jz4740-adc.o] Error 1
make[1]: *** [drivers/mfd] Error 2
make: *** [drivers] Error 2

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
 drivers/mfd/jz4740-adc.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/mfd/jz4740-adc.c b/drivers/mfd/jz4740-adc.c
index 1e9ee53..ef39528 100644
--- a/drivers/mfd/jz4740-adc.c
+++ b/drivers/mfd/jz4740-adc.c
@@ -16,6 +16,7 @@
  */
 
 #include <linux/err.h>
+#include <linux/io.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
-- 
1.7.5.4

[PATCH 2/2] mfd: jz4740-adc: Don't declare jz4740_adc_cells const

[Axel Lin]

Remove the const keyword to fix below warning:

  CC      drivers/mfd/jz4740-adc.o
drivers/mfd/jz4740-adc.c: In function 'jz4740_adc_probe':
drivers/mfd/jz4740-adc.c:290: warning: passing argument 3 of 'mfd_add_devices' discards qualifiers from pointer target type
include/linux/mfd/core.h:93: note: expected 'struct mfd_cell *' but argument is of type 'const struct mfd_cell *'

Also make jz4740_adc_cells static, is not used outside
this driver so no need to make the symbol global.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
 drivers/mfd/jz4740-adc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mfd/jz4740-adc.c b/drivers/mfd/jz4740-adc.c
index ef39528..18ed805 100644
--- a/drivers/mfd/jz4740-adc.c
+++ b/drivers/mfd/jz4740-adc.c
@@ -181,7 +181,7 @@ static struct resource jz4740_battery_resources[] = {
 	},
 };
 
-const struct mfd_cell jz4740_adc_cells[] = {
+static struct mfd_cell jz4740_adc_cells[] = {
 	{
 		.id = 0,
 		.name = "jz4740-hwmon",
-- 
1.7.5.4

Re: [PATCH 1/2] mfd: jz4740-adc: Include linux/io.h

[Lars-Peter Clausen]

On 12/09/2011 04:27 AM, Axel Lin wrote:
> Include linux/io.h to fix below build error:
> 
>   CC      drivers/mfd/jz4740-adc.o
> drivers/mfd/jz4740-adc.c: In function 'jz4740_adc_irq_demux':
> drivers/mfd/jz4740-adc.c:73: error: implicit declaration of function 'readb'
> drivers/mfd/jz4740-adc.c: In function 'jz4740_adc_set_enabled':
> drivers/mfd/jz4740-adc.c:110: error: implicit declaration of function 'writeb'
> drivers/mfd/jz4740-adc.c: In function 'jz4740_adc_set_config':
> drivers/mfd/jz4740-adc.c:146: error: implicit declaration of function 'readl'
> drivers/mfd/jz4740-adc.c:151: error: implicit declaration of function 'writel'
> drivers/mfd/jz4740-adc.c: In function 'jz4740_adc_probe':
> drivers/mfd/jz4740-adc.c:249: error: implicit declaration of function 'ioremap_nocache'
> drivers/mfd/jz4740-adc.c:249: warning: assignment makes pointer from integer without a cast
> drivers/mfd/jz4740-adc.c:289: warning: passing argument 3 of 'mfd_add_devices' discards qualifiers from pointer target type
> include/linux/mfd/core.h:93: note: expected 'struct mfd_cell *' but argument is of type 'const struct mfd_cell *'
> drivers/mfd/jz4740-adc.c:299: error: implicit declaration of function 'iounmap'
> make[2]: *** [drivers/mfd/jz4740-adc.o] Error 1
> make[1]: *** [drivers/mfd] Error 2
> make: *** [drivers] Error 2
> 
> Signed-off-by: Axel Lin <axel.lin@gmail.com>

Acked-by: Lars-Peter Clausen <lars@metafoo.de>

> ---
>  drivers/mfd/jz4740-adc.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/mfd/jz4740-adc.c b/drivers/mfd/jz4740-adc.c
> index 1e9ee53..ef39528 100644
> --- a/drivers/mfd/jz4740-adc.c
> +++ b/drivers/mfd/jz4740-adc.c
> @@ -16,6 +16,7 @@
>   */
>  
>  #include <linux/err.h>
> +#include <linux/io.h>
>  #include <linux/irq.h>
>  #include <linux/interrupt.h>
>  #include <linux/kernel.h>

Re: [PATCH 1/2] mfd: jz4740-adc: Include linux/io.h

[Samuel Ortiz]

Hi Axel,

On Fri, Dec 09, 2011 at 11:27:55AM +0800, Axel Lin wrote:
> Include linux/io.h to fix below build error:
Thanks. This one and the next one applied.

Cheers,
Samuel.

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