Skip to contentSkip to conversation

PNP: skip dev->protocol NULL checks

PATCH Bjorn Helgaas 1 participant 1 message Feb 21, 2008 Pnp support

lore
Share & tools
lore
#0 lore raw

Every PNP device should have a valid protocol pointer. If it doesn't, something's wrong and we should oops so we can find and fix the problem.

[This fixes a Coverity warning, but does not need to be in 2.6.25. I'd rather have it in -mm for a while and put it in 2.6.26.]

drivers/pnp/driver.c +2 -2
Index: work6/drivers/pnp/driver.c
===================================================================
@@ -167,7 +167,7 @@
 			return error;
 	}
 
-	if (pnp_dev->protocol && pnp_dev->protocol->suspend)
+	if (pnp_dev->protocol->suspend)
 		pnp_dev->protocol->suspend(pnp_dev, state);
 	return 0;
 }
@@ -181,7 +181,7 @@
 	if (!pnp_drv)
 		return 0;
 
-	if (pnp_dev->protocol && pnp_dev->protocol->resume)
+	if (pnp_dev->protocol->resume)
 		pnp_dev->protocol->resume(pnp_dev);
 
 	if (pnp_can_write(pnp_dev)) {