Commit 632155e6 authored by Yoann Padioleau's avatar Yoann Padioleau Committed by Linus Torvalds
Browse files

potential parse error in ifdef 



I have made a tool to parse the kernel that does not pre-process the
source.  That means that my parser tries to parse all the code, including
code in the #else branch or code that is not often compiled because the
driver is not very used (or not used at all).  So, my parser sometimes
reports parse error not originally detected by gcc.  Here is my (first)
patch.

[akpm@linux-foundation.org: fix amd8111e.c]
Signed-off-by: default avatarYoann Padioleau <padator@wanadoo.fr>
Acked-by: default avatarMatthew Wilcox <matthew@wil.cx>
Acked-by: default avatarWim Van Sebroeck <wim@iguana.be>
Acked-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
Acked-by: default avatarJeff Garzik <jeff@garzik.org>
Acked-by: default avatarJames Bottomley <James.Bottomley@steeleye.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 78b7611c

drivers/char/watchdog/ixp2000_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static void __exit ixp2000_wdt_exit(void) 
module_init(ixp2000_wdt_init);

module_exit(ixp2000_wdt_exit);



MODULE_AUTHOR("Deepak Saxena <dsaxena@plexity.net">);

MODULE_AUTHOR("Deepak Saxena <dsaxena@plexity.net>");

MODULE_DESCRIPTION("IXP2000 Network Processor Watchdog");



module_param(heartbeat, int, 0);

drivers/mtd/devices/pmc551.c

+1 −1
Original line number Diff line number Diff line
@@ -650,7 +650,7 @@ MODULE_DESCRIPTION(PMC551_VERSION); 
 */

static int msize = 0;

#if defined(CONFIG_MTD_PMC551_APERTURE_SIZE)

static int asize = CONFIG_MTD_PMC551_APERTURE_SIZE

static int asize = CONFIG_MTD_PMC551_APERTURE_SIZE;

#else

static int asize = 0;

#endif

drivers/mtd/nand/autcpu12.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static void autcpu12_hwcontrol(struct mtd_info *mtd, int cmd, 
	struct nand_chip *chip = mtd->priv;



	if (ctrl & NAND_CTRL_CHANGE) {

		void __iomem *addr

		void __iomem *addr;

		unsigned char bits;



		addr = CS89712_VIRT_BASE + AUTCPU12_SMC_PORT_OFFSET;

drivers/mtd/nand/ppchameleonevb.c

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ __setup("ppchameleonevb_fio_pbase=", ppchameleonevb_fio_pbase); 
 */

static struct mtd_partition partition_info_hi[] = {

      { .name = "PPChameleon HI Nand Flash",

	offset = 0,

	.offset = 0,

	.size = 128 * 1024 * 1024

      }

};

drivers/net/amd8111e.c

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ This function will write into PHY registers. 
*/

static int amd8111e_write_phy(struct amd8111e_priv* lp,int phy_id, int reg, u32 val)

{

	unsigned int repeat = REPEAT_CNT

	unsigned int repeat = REPEAT_CNT;

	void __iomem *mmio = lp->mmio;

	unsigned int reg_val;

CRA Git | Maintained and supported by SUSTech CRA and CCSE