diff options
author | Li Jun <jun.li@nxp.com> | 2018-06-27 07:45:26 +0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-06-28 19:49:48 +0900 |
commit | d3a4c916a92f7e50acd58b54f300c4390c04639f (patch) | |
tree | ba418fff7f1b05844a76be2bfce8ae89463b7983 | |
parent | c2ee5e18652f7ed2bf6e0fbaa374f23cfd406e72 (diff) | |
download | linux-stable-d3a4c916a92f7e50acd58b54f300c4390c04639f.tar.gz linux-stable-d3a4c916a92f7e50acd58b54f300c4390c04639f.tar.bz2 linux-stable-d3a4c916a92f7e50acd58b54f300c4390c04639f.zip |
staging: typec: tcpci: use IS_ERR() instead of PTR_ERR_OR_ZERO()
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>
-rw-r--r-- | drivers/staging/typec/tcpci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/typec/tcpci.c b/drivers/staging/typec/tcpci.c index 076498aefd6d..b63f14777720 100644 --- a/drivers/staging/typec/tcpci.c +++ b/drivers/staging/typec/tcpci.c @@ -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); |