staging: typec: tcpci: use IS_ERR() instead of PTR_ERR_OR_ZERO()
authorLi Jun <jun.li@nxp.com>
Tue, 26 Jun 2018 23:45:26 +0000 (07:45 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 28 Jun 2018 10:49:48 +0000 (19:49 +0900)
As tcpm_register_port() and tcpci_register_port() never return
NULL and NULL is not a success in this case, use IS_ERR() to check
the return value of both.

Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/typec/tcpci.c

index 076498a..b63f147 100644 (file)
@@ -509,7 +509,7 @@ struct tcpci *tcpci_register_port(struct device *dev, struct tcpci_data *data)
                return ERR_PTR(err);
 
        tcpci->port = tcpm_register_port(tcpci->dev, &tcpci->tcpc);
-       if (PTR_ERR_OR_ZERO(tcpci->port))
+       if (IS_ERR(tcpci->port))
                return ERR_CAST(tcpci->port);
 
        return tcpci;
@@ -551,7 +551,7 @@ static int tcpci_probe(struct i2c_client *client,
                return err;
 
        chip->tcpci = tcpci_register_port(&client->dev, &chip->data);
-       if (PTR_ERR_OR_ZERO(chip->tcpci))
+       if (IS_ERR(chip->tcpci))
                return PTR_ERR(chip->tcpci);
 
        i2c_set_clientdata(client, chip);