[2.6 patch] drivers/net/tulip/dmfe.c: remove a check after use

[Adrian Bunk]

On Thu, Mar 24, 2005 at 09:58:27PM -0500, Jeff Garzik wrote:
> Adrian Bunk wrote:
> >This patch fixes a check after use found by the Coverity checker.
> >
> >Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
> >
> >--- linux-2.6.12-rc1-mm1-full/drivers/net/tulip/dmfe.c.old	2005-03-23 
> >05:05:36.000000000 +0100
> >+++ linux-2.6.12-rc1-mm1-full/drivers/net/tulip/dmfe.c	2005-03-23 
> >05:06:00.000000000 +0100
> >@@ -736,20 +736,22 @@
> > 
> > static irqreturn_t dmfe_interrupt(int irq, void *dev_id, struct pt_regs 
> > *regs)
> > {
> > 	struct DEVICE *dev = dev_id;
> > 	struct dmfe_board_info *db = netdev_priv(dev);
> >-	unsigned long ioaddr = dev->base_addr;
> >+	unsigned long ioaddr;
> > 	unsigned long flags;
> > 
> > 	DMFE_DBUG(0, "dmfe_interrupt()", 0);
> > 
> > 	if (!dev) {
> > 		DMFE_DBUG(1, "dmfe_interrupt() without DEVICE arg", 0);
> > 		return IRQ_NONE;
> > 	}
> 
> I would prefer to remove the "if (!dev)" test, since it shouldn't ever 
> succeed.

Patch below.

> 	Jeff

cu
Adrian



<--  snip  -->


This patch removes a NULL check that was useles because it happened 
after the first dereference of the variable.

Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>

--- linux-2.6.12-rc1-mm3-full/drivers/net/tulip/dmfe.c.old	2005-03-26 19:06:46.000000000 +0100
+++ linux-2.6.12-rc1-mm3-full/drivers/net/tulip/dmfe.c	2005-03-26 19:07:03.000000000 +0100
@@ -744,11 +744,6 @@
 
 	DMFE_DBUG(0, "dmfe_interrupt()", 0);
 
-	if (!dev) {
-		DMFE_DBUG(1, "dmfe_interrupt() without DEVICE arg", 0);
-		return IRQ_NONE;
-	}
-
 	spin_lock_irqsave(&db->lock, flags);
 
 	/* Got DM910X status */

-
To unsubscribe from this list: send the line "unsubscribe linux-net" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html