Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp413851pxb; Thu, 12 Nov 2020 07:00:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJxzbXwtIDg9HE3cYfa7UX7tp8nJ+KT0wK8q2cRCPtio9ad47ICEOH82cvmSUD+vbKb4/bfp X-Received: by 2002:a50:ab15:: with SMTP id s21mr158160edc.88.1605193240885; Thu, 12 Nov 2020 07:00:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605193240; cv=none; d=google.com; s=arc-20160816; b=BecWb+u15KcQweCH+bN7uBUuaELeotXJMCJXRvt2MC36gEiFzQPLIU/gnZ+0hPDAby I/Dn3olVzTtzANE1yagVjpM+c9rti9MOcLVYHtQfrKNoQGnRIt6qCaTllVWEhlxmAEMq rrDjOMLkxojF93vergWqYzPJ+m6a0mC9GbOO8I0zMTMvZ/5x6rYX3ZTe9iYm3lWRxKzZ fXzPnk8M0ZulfSqQobMMU+g5ryKx62x6l7uMOmbKCTPOJLvq8kjDfsQ8x0w/akNlK4Ym o2mIS0UcgtZ+GNO8/SGp8f1wS4Yc7uQlNp/qDMX1CNKhkWi+DvvGj3fgeDTREQ0NB/Wv +zOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from; bh=rxOvx9jkC+wFMUjFgEC2G4CQwO+Xf/TYalNE/YlYNrY=; b=VnKFffbds2uKUYisvzh3MBpGR/wwRw9t6M9upudVssdkEi+E32ndxmhf1yEKSmInPx S5oPYbg1wlZwUEx1wJ7HU5JCgWa0CQOl24mMgGWC79Z0AsQ8r7Hm2oVt52FrTvSDc8RJ U0HalldU5IbfDGeAqyBvOeHdTOpMPSFgIjea68l4O3uLbZV9PU7rertUrG8Jbsx76ZYV lWap8rrGooTQe+lq57MuBSABAHxQCBF8D5JTlJ61oz6aoJwN/6GdRDuD71yz+XNuY5m2 opitRvQJhDzxZMgxacF44N1IsnWKu+4aO2DyoqRgXSzR8g+jQ9PFeEc8K2jaU0YaMZQe sZaw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w5si3319211edt.245.2020.11.12.06.59.59; Thu, 12 Nov 2020 07:00:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728467AbgKLOz7 (ORCPT + 99 others); Thu, 12 Nov 2020 09:55:59 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:7224 "EHLO szxga04-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727035AbgKLOz7 (ORCPT ); Thu, 12 Nov 2020 09:55:59 -0500 Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4CX4R30KNVzkgRp; Thu, 12 Nov 2020 22:55:43 +0800 (CST) Received: from localhost (10.174.176.180) by DGGEMS409-HUB.china.huawei.com (10.3.19.209) with Microsoft SMTP Server id 14.3.487.0; Thu, 12 Nov 2020 22:55:50 +0800 From: YueHaibing To: , , , , , CC: , , YueHaibing Subject: [PATCH] net: dsa: sja1105: Fix return value check in sja1105_ptp_clock_register() Date: Thu, 12 Nov 2020 22:55:32 +0800 Message-ID: <20201112145532.38320-1-yuehaibing@huawei.com> X-Mailer: git-send-email 2.10.2.windows.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.174.176.180] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org drivers/net/dsa/sja1105/sja1105_ptp.c:869 sja1105_ptp_clock_register() warn: passing zero to 'PTR_ERR' ptp_clock_register() returns ERR_PTR() and never returns NULL. The NULL test should be removed. Fixes: bb77f36ac21d ("net: dsa: sja1105: Add support for the PTP clock") Signed-off-by: YueHaibing --- drivers/net/dsa/sja1105/sja1105_ptp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/dsa/sja1105/sja1105_ptp.c b/drivers/net/dsa/sja1105/sja1105_ptp.c index 1b90570b257b..1e41d491c854 100644 --- a/drivers/net/dsa/sja1105/sja1105_ptp.c +++ b/drivers/net/dsa/sja1105/sja1105_ptp.c @@ -865,7 +865,7 @@ int sja1105_ptp_clock_register(struct dsa_switch *ds) spin_lock_init(&tagger_data->meta_lock); ptp_data->clock = ptp_clock_register(&ptp_data->caps, ds->dev); - if (IS_ERR_OR_NULL(ptp_data->clock)) + if (IS_ERR(ptp_data->clock)) return PTR_ERR(ptp_data->clock); ptp_data->cmd.corrclk4ts = true; -- 2.17.1