提交 1790c228 编写于 作者: J Julia Lawall 提交者: David S. Miller

drivers/atm/idt77252.c: Remove unnecessary error check

This code does not call deinit_card(card); in an error case, as done in
other error-handling code in the same function.  But actually, the called
function init_sram can only return 0, so there is no need for the error
check at all.

init_sram is also given a void return type, and its single return statement
at the end of the function is dropped.

A simplified version of the sematic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@r exists@
@r@
statement S1,S2,S3;
constant C1,C2,C3;
@@

*if (...)
 {... S1 return -C1;}
...
*if (...)
 {... when != S1
    return -C2;}
...
*if (...)
 {... S1 return -C3;}
// </smpl>
Signed-off-by: NJulia Lawall <julia@diku.dk>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 f009627b
...@@ -3152,7 +3152,7 @@ deinit_card(struct idt77252_dev *card) ...@@ -3152,7 +3152,7 @@ deinit_card(struct idt77252_dev *card)
} }
static int __devinit static void __devinit
init_sram(struct idt77252_dev *card) init_sram(struct idt77252_dev *card)
{ {
int i; int i;
...@@ -3298,7 +3298,6 @@ init_sram(struct idt77252_dev *card) ...@@ -3298,7 +3298,6 @@ init_sram(struct idt77252_dev *card)
SAR_REG_RXFD); SAR_REG_RXFD);
IPRINTK("%s: SRAM initialization complete.\n", card->name); IPRINTK("%s: SRAM initialization complete.\n", card->name);
return 0;
} }
static int __devinit static int __devinit
...@@ -3410,8 +3409,7 @@ init_card(struct atm_dev *dev) ...@@ -3410,8 +3409,7 @@ init_card(struct atm_dev *dev)
writel(readl(SAR_REG_CFG) | conf, SAR_REG_CFG); writel(readl(SAR_REG_CFG) | conf, SAR_REG_CFG);
if (init_sram(card) < 0) init_sram(card);
return -1;
/********************************************************************/ /********************************************************************/
/* A L L O C R A M A N D S E T V A R I O U S T H I N G S */ /* A L L O C R A M A N D S E T V A R I O U S T H I N G S */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册