Merge branch 'i2c/for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[thirdparty/kernel/linux.git] / drivers / mfd / sm501.c

diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c
index 66af659b01b277a1aabd67a7fb893c10eb72dc50..2a87b0d2f21ff034ee8f1f7ddd4684b1bb1c300e 100644 (file)
--- a/drivers/mfd/sm501.c
+++ b/drivers/mfd/sm501.c
@@ -1050,13 +1050,13 @@ static int sm501_register_gpio(struct sm501_devdata *sm)
        spin_lock_init(&gpio->lock);
 
        gpio->regs_res = request_mem_region(iobase, 0x20, "sm501-gpio");
-       if (gpio->regs_res == NULL) {
+       if (!gpio->regs_res) {
                dev_err(sm->dev, "gpio: failed to request region\n");
                return -ENXIO;
        }
 
        gpio->regs = ioremap(iobase, 0x20);
-       if (gpio->regs == NULL) {
+       if (!gpio->regs) {
                dev_err(sm->dev, "gpio: failed to remap registers\n");
                ret = -ENXIO;
                goto err_claimed;
@@ -1358,7 +1358,7 @@ static int sm501_init_dev(struct sm501_devdata *sm)
                        sm501_register_gpio(sm);
        }
 
-       if (pdata && pdata->gpio_i2c != NULL && pdata->gpio_i2c_nr > 0) {
+       if (pdata && pdata->gpio_i2c && pdata->gpio_i2c_nr > 0) {
                if (!sm501_gpio_isregistered(sm))
                        dev_err(sm->dev, "no gpio available for i2c gpio.\n");
                else
@@ -1383,9 +1383,8 @@ static int sm501_plat_probe(struct platform_device *dev)
        struct sm501_devdata *sm;
        int ret;
 
-       sm = kzalloc(sizeof(struct sm501_devdata), GFP_KERNEL);
-       if (sm == NULL) {
-               dev_err(&dev->dev, "no memory for device data\n");
+       sm = kzalloc(sizeof(*sm), GFP_KERNEL);
+       if (!sm) {
                ret = -ENOMEM;
                goto err1;
        }
@@ -1403,8 +1402,7 @@ static int sm501_plat_probe(struct platform_device *dev)
 
        sm->io_res = platform_get_resource(dev, IORESOURCE_MEM, 1);
        sm->mem_res = platform_get_resource(dev, IORESOURCE_MEM, 0);
-
-       if (sm->io_res == NULL || sm->mem_res == NULL) {
+       if (!sm->io_res || !sm->mem_res) {
                dev_err(&dev->dev, "failed to get IO resource\n");
                ret = -ENOENT;
                goto err_res;
@@ -1412,8 +1410,7 @@ static int sm501_plat_probe(struct platform_device *dev)
 
        sm->regs_claim = request_mem_region(sm->io_res->start,
                                            0x100, "sm501");
-
-       if (sm->regs_claim == NULL) {
+       if (!sm->regs_claim) {
                dev_err(&dev->dev, "cannot claim registers\n");
                ret = -EBUSY;
                goto err_res;
@@ -1422,8 +1419,7 @@ static int sm501_plat_probe(struct platform_device *dev)
        platform_set_drvdata(dev, sm);
 
        sm->regs = ioremap(sm->io_res->start, resource_size(sm->io_res));
-
-       if (sm->regs == NULL) {
+       if (!sm->regs) {
                dev_err(&dev->dev, "cannot remap registers\n");
                ret = -EIO;
                goto err_claim;
@@ -1449,7 +1445,7 @@ static void sm501_set_power(struct sm501_devdata *sm, int on)
 {
        struct sm501_platdata *pd = sm->platdata;
 
-       if (pd == NULL)
+       if (!pd)
                return;
 
        if (pd->get_power) {
@@ -1573,9 +1569,8 @@ static int sm501_pci_probe(struct pci_dev *dev,
        struct sm501_devdata *sm;
        int err;
 
-       sm = kzalloc(sizeof(struct sm501_devdata), GFP_KERNEL);
-       if (sm == NULL) {
-               dev_err(&dev->dev, "no memory for device data\n");
+       sm = kzalloc(sizeof(*sm), GFP_KERNEL);
+       if (!sm) {
                err = -ENOMEM;
                goto err1;
        }
@@ -1626,15 +1621,14 @@ static int sm501_pci_probe(struct pci_dev *dev,
 
        sm->regs_claim = request_mem_region(sm->io_res->start,
                                            0x100, "sm501");
-       if (sm->regs_claim == NULL) {
+       if (!sm->regs_claim) {
                dev_err(&dev->dev, "cannot claim registers\n");
                err= -EBUSY;
                goto err3;
        }
 
        sm->regs = pci_ioremap_bar(dev, 1);
-
-       if (sm->regs == NULL) {
+       if (!sm->regs) {
                dev_err(&dev->dev, "cannot remap registers\n");
                err = -EIO;
                goto err4;