w1: Remove unneeded use of assert() and remove w1_log.h

[karo-tx-linux.git] / drivers / w1 / masters / matrox_w1.c

diff --git a/drivers/w1/masters/matrox_w1.c b/drivers/w1/masters/matrox_w1.c
index 3749db8b43969253c2089419f980d5553ca140c2..97a676bf5989eba00781b1a2c6387eff4b9d53d8 100644 (file)
--- a/drivers/w1/masters/matrox_w1.c
+++ b/drivers/w1/masters/matrox_w1.c
@@ -36,7 +36,6 @@
 
 #include "../w1.h"
 #include "../w1_int.h"
-#include "../w1_log.h"
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Evgeniy Polyakov <zbr@ioremap.net>");
@@ -157,9 +156,6 @@ static int matrox_w1_probe(struct pci_dev *pdev, const struct pci_device_id *ent
        struct matrox_device *dev;
        int err;
 
-       assert(pdev != NULL);
-       assert(ent != NULL);
-
        if (pdev->vendor != PCI_VENDOR_ID_MATROX || pdev->device != PCI_DEVICE_ID_MATROX_G400)
                return -ENODEV;
 
@@ -224,8 +220,6 @@ static void matrox_w1_remove(struct pci_dev *pdev)
 {
        struct matrox_device *dev = pci_get_drvdata(pdev);
 
-       assert(dev != NULL);
-
        if (dev->found) {
                w1_remove_master_device(dev->bus_master);
                iounmap(dev->virt_addr);