Skip to content

Commit

Permalink
staging: typec: tcpci: use IS_ERR() instead of PTR_ERR_OR_ZERO()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Li Jun authored and Greg Kroah-Hartman committed Jun 28, 2018
1 parent c2ee5e1 commit d3a4c91
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/staging/typec/tcpci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit d3a4c91

Please sign in to comment.