PNP: remove null pointer checks

Remove some null pointer checks.  Null pointers in these areas indicate
programming errors, and I think it's better to oops immediately rather than
return an error that is easily ignored.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Adam Belay <ambx1@neo.rr.com>
Cc: Len Brown <lenb@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/include/linux/pnp.h b/include/linux/pnp.h
index 16b46aace349..664d68cb1fbd 100644
--- a/include/linux/pnp.h
+++ b/include/linux/pnp.h
@@ -243,11 +243,11 @@ struct pnp_fixup {
 #define PNP_CONFIGURABLE        0x0008
 #define PNP_REMOVABLE           0x0010
 
-#define pnp_can_read(dev)       (((dev)->protocol) && ((dev)->protocol->get) && \
+#define pnp_can_read(dev)       (((dev)->protocol->get) && \
                                  ((dev)->capabilities & PNP_READ))
-#define pnp_can_write(dev)      (((dev)->protocol) && ((dev)->protocol->set) && \
+#define pnp_can_write(dev)      (((dev)->protocol->set) && \
                                  ((dev)->capabilities & PNP_WRITE))
-#define pnp_can_disable(dev)    (((dev)->protocol) && ((dev)->protocol->disable) && \
+#define pnp_can_disable(dev)    (((dev)->protocol->disable) && \
                                  ((dev)->capabilities & PNP_DISABLE))
 #define pnp_can_configure(dev)  ((!(dev)->active) && \
                                  ((dev)->capabilities & PNP_CONFIGURABLE))