Skip to content

Commit

Permalink
potential parse error in ifdef
Browse files Browse the repository at this point in the history
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.

[[email protected]: fix amd8111e.c]
Signed-off-by: Yoann Padioleau <[email protected]>
Acked-by: Matthew Wilcox <[email protected]>
Acked-by: Wim Van Sebroeck <[email protected]>
Acked-by: David Woodhouse <[email protected]>
Acked-by: Jeff Garzik <[email protected]>
Acked-by: James Bottomley <[email protected]>
Cc: Russell King <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Yoann Padioleau authored and Linus Torvalds committed Jun 1, 2007
1 parent 78b7611 commit 632155e
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion drivers/char/watchdog/ixp2000_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]">);
MODULE_AUTHOR("Deepak Saxena <[email protected]>");
MODULE_DESCRIPTION("IXP2000 Network Processor Watchdog");

module_param(heartbeat, int, 0);
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/devices/pmc551.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/nand/autcpu12.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/nand/ppchameleonevb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
};
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/amd8111e.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion drivers/net/amd8111e.h
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@ typedef enum {
#define SSTATE 2

/* Assume contoller gets data 10 times the maximum processing time */
#define REPEAT_CNT 10;
#define REPEAT_CNT 10

/* amd8111e decriptor flag definitions */
typedef enum {
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/skfp/smt.c
Original file line number Diff line number Diff line change
Expand Up @@ -1748,7 +1748,7 @@ char *addr_to_string(struct fddi_addr *addr)
#endif

#ifdef AM29K
smt_ifconfig(int argc, char *argv[])
int smt_ifconfig(int argc, char *argv[])
{
if (argc >= 2 && !strcmp(argv[0],"opt_bypass") &&
!strcmp(argv[1],"yes")) {
Expand Down
2 changes: 1 addition & 1 deletion drivers/scsi/aic7xxx/aic79xx_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -5180,7 +5180,7 @@ ahd_handle_devreset(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,
cur_lun = lun;
max_lun = lun;
}
for (cur_lun <= max_lun; cur_lun++) {
for (;cur_lun <= max_lun; cur_lun++) {
struct ahd_tmode_lstate* lstate;

lstate = tstate->enabled_luns[cur_lun];
Expand Down
2 changes: 1 addition & 1 deletion sound/arm/sa11xx-uda1341.c
Original file line number Diff line number Diff line change
Expand Up @@ -987,7 +987,7 @@ static int __init sa11xx_uda1341_init(void)
if (platform_get_drvdata(device))
return 0;
platform_device_unregister(device);
err = -ENODEV
err = -ENODEV;
} else
err = PTR_ERR(device);
platform_driver_unregister(&sa11xx_uda1341_driver);
Expand Down

0 comments on commit 632155e

Please sign in to comment.