net: netcp: replace IS_ERR_OR_NULL by IS_ERR

knav_queue_open always returns an ERR_PTR value, never NULL.  This can be
confirmed by unfolding the function calls and conforms to the function's
documentation.  Thus, replace IS_ERR_OR_NULL by IS_ERR in error checks.

The change is made using the following semantic patch:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression x;
statement S;
@@

x = knav_queue_open(...);
if (
-   IS_ERR_OR_NULL
+   IS_ERR
    (x)) S
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c
index 78b4c831f5ad39757bebd9259ed8e259c292bc84..7981b99ea06e32424fabbdf830795a896a856daf 100644 (file)
--- a/drivers/net/ethernet/ti/netcp_core.c
+++ b/drivers/net/ethernet/ti/netcp_core.c
@@ -1568,7 +1568,7 @@ static int netcp_setup_navigator_resources(struct net_device *ndev)
        /* open Tx completion queue */
        snprintf(name, sizeof(name), "tx-compl-%s", ndev->name);
        netcp->tx_compl_q = knav_queue_open(name, netcp->tx_compl_qid, 0);
-       if (IS_ERR_OR_NULL(netcp->tx_compl_q)) {
+       if (IS_ERR(netcp->tx_compl_q)) {
                ret = PTR_ERR(netcp->tx_compl_q);
                goto fail;
        }
@@ -1588,7 +1588,7 @@ static int netcp_setup_navigator_resources(struct net_device *ndev)
        /* open Rx completion queue */
        snprintf(name, sizeof(name), "rx-compl-%s", ndev->name);
        netcp->rx_queue = knav_queue_open(name, netcp->rx_queue_id, 0);
-       if (IS_ERR_OR_NULL(netcp->rx_queue)) {
+       if (IS_ERR(netcp->rx_queue)) {
                ret = PTR_ERR(netcp->rx_queue);
                goto fail;
        }
@@ -1610,7 +1610,7 @@ static int netcp_setup_navigator_resources(struct net_device *ndev)
             ++i) {
                snprintf(name, sizeof(name), "rx-fdq-%s-%d", ndev->name, i);
                netcp->rx_fdq[i] = knav_queue_open(name, KNAV_QUEUE_GP, 0);
-               if (IS_ERR_OR_NULL(netcp->rx_fdq[i])) {
+               if (IS_ERR(netcp->rx_fdq[i])) {
                        ret = PTR_ERR(netcp->rx_fdq[i]);
                        goto fail;
                }