mfd: abx500-core: Adjust 14 checks for null pointers

[linux-2.6-microblaze.git] / drivers / mfd / abx500-core.c

diff --git a/drivers/mfd/abx500-core.c b/drivers/mfd/abx500-core.c
index 17176e9..f282d39 100644 (file)
--- a/drivers/mfd/abx500-core.c
+++ b/drivers/mfd/abx500-core.c
@@ -65,7 +65,7 @@ int abx500_set_register_interruptible(struct device *dev, u8 bank, u8 reg,
        struct abx500_ops *ops;
 
        lookup_ops(dev->parent, &ops);
-       if ((ops != NULL) && (ops->set_register != NULL))
+       if (ops && ops->set_register)
                return ops->set_register(dev, bank, reg, value);
        else
                return -ENOTSUPP;
@@ -78,7 +78,7 @@ int abx500_get_register_interruptible(struct device *dev, u8 bank, u8 reg,
        struct abx500_ops *ops;
 
        lookup_ops(dev->parent, &ops);
-       if ((ops != NULL) && (ops->get_register != NULL))
+       if (ops && ops->get_register)
                return ops->get_register(dev, bank, reg, value);
        else
                return -ENOTSUPP;
@@ -91,7 +91,7 @@ int abx500_get_register_page_interruptible(struct device *dev, u8 bank,
        struct abx500_ops *ops;
 
        lookup_ops(dev->parent, &ops);
-       if ((ops != NULL) && (ops->get_register_page != NULL))
+       if (ops && ops->get_register_page)
                return ops->get_register_page(dev, bank,
                        first_reg, regvals, numregs);
        else
@@ -105,7 +105,7 @@ int abx500_mask_and_set_register_interruptible(struct device *dev, u8 bank,
        struct abx500_ops *ops;
 
        lookup_ops(dev->parent, &ops);
-       if ((ops != NULL) && (ops->mask_and_set_register != NULL))
+       if (ops && ops->mask_and_set_register)
                return ops->mask_and_set_register(dev, bank,
                        reg, bitmask, bitvalues);
        else
@@ -118,7 +118,7 @@ int abx500_get_chip_id(struct device *dev)
        struct abx500_ops *ops;
 
        lookup_ops(dev->parent, &ops);
-       if ((ops != NULL) && (ops->get_chip_id != NULL))
+       if (ops && ops->get_chip_id)
                return ops->get_chip_id(dev);
        else
                return -ENOTSUPP;
@@ -130,7 +130,7 @@ int abx500_event_registers_startup_state_get(struct device *dev, u8 *event)
        struct abx500_ops *ops;
 
        lookup_ops(dev->parent, &ops);
-       if ((ops != NULL) && (ops->event_registers_startup_state_get != NULL))
+       if (ops && ops->event_registers_startup_state_get)
                return ops->event_registers_startup_state_get(dev, event);
        else
                return -ENOTSUPP;
@@ -142,7 +142,7 @@ int abx500_startup_irq_enabled(struct device *dev, unsigned int irq)
        struct abx500_ops *ops;
 
        lookup_ops(dev->parent, &ops);
-       if ((ops != NULL) && (ops->startup_irq_enabled != NULL))
+       if (ops && ops->startup_irq_enabled)
                return ops->startup_irq_enabled(dev, irq);
        else
                return -ENOTSUPP;