Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cba3309e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-cleanup-sparse-for-v3.5' of... 

Merge tag 'omap-cleanup-sparse-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup

Sparse and cppcheck warning fixes

By Paul Walmsley
via Paul Walmsley (1) and Tony Lindgren (1)
* tag 'omap-cleanup-sparse-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: OMAP2+: clean up some cppcheck warnings
  ARM: OMAP1: board files: deduplicate and clean some NAND-related code
  ARM: OMAP: USB: remove unnecessary sideways include
  ARM: OMAP: DMA: use constant array maximum, drop some LCD DMA code
  ARM: OMAP: OCM RAM: use memset_io() when clearing SRAM
  ARM: OMAP: fix 'using plain integer as NULL pointer' sparse warnings
  ARM: OMAP2+: GPMC: resolve type-conversion warning from sparse
  ARM: OMAP1: OHCI: use platform_data fn ptr to enable OCPI bus
  ARM: OMAP1: OCPI: move to mach-omap1/
  ARM: OMAP: add includes for missing prototypes
  ARM: OMAP2+: declare file-local functions as static

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 976eb445 09f45b83

arch/arm/mach-omap1/Makefile

+9 −4
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ endif 


obj-$(CONFIG_OMAP_32K_TIMER)	+= timer32k.o



# OCPI interconnect support for 1710, 1610 and 5912

obj-$(CONFIG_ARCH_OMAP16XX) += ocpi.o



# Power Management

obj-$(CONFIG_PM) += pm.o sleep.o
@@ -28,13 +31,15 @@ usb-fs-$(CONFIG_USB) := usb.o 
obj-y					+= $(usb-fs-m) $(usb-fs-y)



# Specific board support

obj-$(CONFIG_MACH_OMAP_H2)		+= board-h2.o board-h2-mmc.o

obj-$(CONFIG_MACH_OMAP_H2)		+= board-h2.o board-h2-mmc.o \

					   board-nand.o

obj-$(CONFIG_MACH_OMAP_INNOVATOR)	+= board-innovator.o

obj-$(CONFIG_MACH_OMAP_GENERIC)		+= board-generic.o

obj-$(CONFIG_MACH_OMAP_PERSEUS2)	+= board-perseus2.o

obj-$(CONFIG_MACH_OMAP_FSAMPLE)		+= board-fsample.o

obj-$(CONFIG_MACH_OMAP_PERSEUS2)	+= board-perseus2.o board-nand.o

obj-$(CONFIG_MACH_OMAP_FSAMPLE)		+= board-fsample.o board-nand.o

obj-$(CONFIG_MACH_OMAP_OSK)		+= board-osk.o

obj-$(CONFIG_MACH_OMAP_H3)		+= board-h3.o board-h3-mmc.o

obj-$(CONFIG_MACH_OMAP_H3)		+= board-h3.o board-h3-mmc.o \

					   board-nand.o

obj-$(CONFIG_MACH_VOICEBLUE)		+= board-voiceblue.o

obj-$(CONFIG_MACH_OMAP_PALMTE)		+= board-palmte.o

obj-$(CONFIG_MACH_OMAP_PALMZ71)		+= board-palmz71.o

arch/arm/mach-omap1/ams-delta-fiq.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ void __init ams_delta_init_fiq(void) 
	}



	retval = request_irq(INT_DEFERRED_FIQ, deferred_fiq,

			IRQ_TYPE_EDGE_RISING, "deferred_fiq", 0);

			IRQ_TYPE_EDGE_RISING, "deferred_fiq", NULL);

	if (retval < 0) {

		pr_err("Failed to get deferred_fiq IRQ, ret=%d\n", retval);

		release_fiq(&fh);

arch/arm/mach-omap1/board-fsample.c

+1 −15
Original line number Diff line number Diff line
@@ -185,20 +185,6 @@ static struct platform_device nor_device = { 
	.resource	= &nor_resource,

};



static void nand_cmd_ctl(struct mtd_info *mtd, int cmd,	unsigned int ctrl)

{

	struct nand_chip *this = mtd->priv;

	unsigned long mask;



	if (cmd == NAND_CMD_NONE)

		return;



	mask = (ctrl & NAND_CLE) ? 0x02 : 0;

	if (ctrl & NAND_ALE)

		mask |= 0x04;

	writeb(cmd, (unsigned long)this->IO_ADDR_W | mask);

}



#define FSAMPLE_NAND_RB_GPIO_PIN	62



static int nand_dev_ready(struct mtd_info *mtd)
@@ -216,7 +202,7 @@ static struct platform_nand_data nand_data = { 
		.part_probe_types	= part_probes,

	},

	.ctrl	= {

		.cmd_ctrl	= nand_cmd_ctl,

		.cmd_ctrl	= omap1_nand_cmd_ctl,

		.dev_ready	= nand_dev_ready,

	},

};

arch/arm/mach-omap1/board-h2.c

+1 −16
Original line number Diff line number Diff line
@@ -179,20 +179,6 @@ static struct mtd_partition h2_nand_partitions[] = { 
	},

};



static void h2_nand_cmd_ctl(struct mtd_info *mtd, int cmd, unsigned int ctrl)

{

	struct nand_chip *this = mtd->priv;

	unsigned long mask;



	if (cmd == NAND_CMD_NONE)

		return;



	mask = (ctrl & NAND_CLE) ? 0x02 : 0;

	if (ctrl & NAND_ALE)

		mask |= 0x04;

	writeb(cmd, (unsigned long)this->IO_ADDR_W | mask);

}



#define H2_NAND_RB_GPIO_PIN	62



static int h2_nand_dev_ready(struct mtd_info *mtd)
@@ -212,9 +198,8 @@ static struct platform_nand_data h2_nand_platdata = { 
		.part_probe_types	= h2_part_probes,

	},

	.ctrl	= {

		.cmd_ctrl	= h2_nand_cmd_ctl,

		.cmd_ctrl	= omap1_nand_cmd_ctl,

		.dev_ready	= h2_nand_dev_ready,



	},

};

arch/arm/mach-omap1/board-h3.c

+1 −15
Original line number Diff line number Diff line
@@ -181,20 +181,6 @@ static struct mtd_partition nand_partitions[] = { 
	},

};



static void nand_cmd_ctl(struct mtd_info *mtd, int cmd, unsigned int ctrl)

{

	struct nand_chip *this = mtd->priv;

	unsigned long mask;



	if (cmd == NAND_CMD_NONE)

		return;



	mask = (ctrl & NAND_CLE) ? 0x02 : 0;

	if (ctrl & NAND_ALE)

		mask |= 0x04;

	writeb(cmd, (unsigned long)this->IO_ADDR_W | mask);

}



#define H3_NAND_RB_GPIO_PIN	10



static int nand_dev_ready(struct mtd_info *mtd)
@@ -214,7 +200,7 @@ static struct platform_nand_data nand_platdata = { 
		.part_probe_types	= part_probes,

	},

	.ctrl	= {

		.cmd_ctrl	= nand_cmd_ctl,

		.cmd_ctrl	= omap1_nand_cmd_ctl,

		.dev_ready	= nand_dev_ready,



	},