leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: typec: tcpci: use IS_ERR() instead of PTR_ERR_OR_ZERO()

Browse Source 
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>
This commit is contained in:
Li Jun 2018-06-27 07:45:26 +08:00 committed by Greg Kroah-Hartman
parent c2ee5e1865
commit d3a4c916a9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/typec/tcpci.c
View File

@ -509,7 +509,7 @@ struct tcpci *tcpci_register_port(struct device *dev, struct tcpci_data *data)
return ERR_PTR(err); return ERR_PTR(err);
tcpci->port = tcpm_register_port(tcpci->dev, &tcpci->tcpc); 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 ERR_CAST(tcpci->port);
return tcpci; return tcpci;
@ -551,7 +551,7 @@ static int tcpci_probe(struct i2c_client *client,
return err; return err;
chip->tcpci = tcpci_register_port(&client->dev, &chip->data); 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); return PTR_ERR(chip->tcpci);
i2c_set_clientdata(client, chip); i2c_set_clientdata(client, chip);