Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Bernard Zhao <bernard@vivo.com>
To:     "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Bernard Zhao <11115066@vivo.com>, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org
Cc:     zhaojunkui2008@126.com, Bernard Zhao <bernard@vivo.com>
Subject: [PATCH] ethernet/ti: delete if NULL check befort devm_kfree
Date:   Sun, 15 May 2022 18:52:05 -0700
Message-Id: <20220516015208.6526-1-bernard@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?dOxymvCHUns+KK3NbB/S5Z8BSf7urd/aScbQiZ9hKH+aj5dlPG23ZCfVVHN1?=
 =?us-ascii?Q?yPDHAlqzoggEwsHHtN8sPSy1uxtn3uKYQyug7GpXZHnIrYZvtRHShIVaNy0b?=
 =?us-ascii?Q?9eHRS9PD/RH/Z1vZHNxCdxNZjRnBazjMcoWErAK/vhR51l/gK70bICG9o+7t?=
 =?us-ascii?Q?vbsZ6p7L859MpLaFG11Odbx5LZ7sMqwVV7j6vA3XRhPMs5Y5nQM0QvAG4Pzp?=
 =?us-ascii?Q?tsj6p5i/kbk57pGp4429Uz0HqC0SCW7dBux3HZIbY9Q7shS8Nyl6MY06H3mt?=
 =?us-ascii?Q?xVbst8K3L2iOl+jXUNyzvrfgttRDZHBCoVgfuy5nUO2iFB6GTjkySmmmCwxU?=
 =?us-ascii?Q?wBnuHeEBN2XQuSsX6tHL2+ZnDfYCdzo0mWuRkTIeJqxbfrumEPA37JB8o5f0?=
 =?us-ascii?Q?p5JEcZDtVroPbuOsPgo+iv2knrnuHDpoJ8eHmQMAC5Kh35eBkAFA7cgENaZl?=
 =?us-ascii?Q?pvP6EIPwYla5cbz0JVNGZBpfVscZaGADbifgG3KLv04UvBzIej4NOy8p2ZBW?=
 =?us-ascii?Q?lSNAUauLCunNepREeJSDoIOEm70U9BnZcbATSj5lb+AFaIG2zaHH2Xu+8bAX?=
 =?us-ascii?Q?RnBnbJ8P5NQPqP+Us8rm1pjF98Hq8ZZv4nGb6GzcQPRSfug0nEEwS57xAKAk?=
 =?us-ascii?Q?iRO6U/v5f62vP7o7wE9jnpiCFmsCTUbjTbgaiUO8KvzHFAzNpW/4yEzh2aMe?=
 =?us-ascii?Q?wzqBzV8pdGvZ8r/e5JwylPQCeybimKQ4G4Tszl7BZaaSFJhP8SlioAQfv4Ff?=
 =?us-ascii?Q?qEp81N2uL+TfhiY5dTNq1IkGVC+fK+T1UFQiHcMHtIFIF3HhMEkJ/GYZg3ZK?=
 =?us-ascii?Q?Q1YZj4F4uB5p6lBa7Jr0wvV2H/pVDBGypTEvutA6/agiA1dacV9txH1vZ5M0?=
 =?us-ascii?Q?Y1sPhbQ4eZI2QI4pQWmfuhPcVEMN8R3mJXOQKOZz/6sMT0IkJDwZomUozVvV?=
 =?us-ascii?Q?/R41jSE7QUtFBW1PAWV4EX0CorsKZsy2j8fNOYv1txSzK8ShH8Kz+XoNkxai?=
 =?us-ascii?Q?+F6Ihp4mRh5flXW/O7O/c4/3iMS72Y/wJUtmKEbmMVL8JPb5CPFE9XAjZoqZ?=
 =?us-ascii?Q?hrjgEETtgD2eunUuIOlgmIypeC2hioAWnTbX0RwbISevH/aDP5CWJhqGws15?=
 =?us-ascii?Q?XCCuZ3JTRycJnHPqDoV3wJga0j2oiU6fr1ad/92N1sRCLb5dYYuB4aAemxDp?=
 =?us-ascii?Q?2ogUAO1qQLbd42dqcwoD7p44ivEPE97R0beVzhLDGYMHcBzXYmwuYjtdP+kD?=
 =?us-ascii?Q?MK1hKMFveYdQgWKl6EIv7sa8n7uFLQaFMli3v3PTulh2YCwhj3BLyOWJ6WUJ?=
 =?us-ascii?Q?G41F0IpEYjQj7hX4wcIT0uyCi8MuryTTVctDFSBzEIXEu1s3QqQ627UpKATQ?=
 =?us-ascii?Q?dbALjJCSxL8zogANv6PJTyTR5GMHBDRqQ9fTTZVod5TaPjPHu8qUwj4dksB2?=
 =?us-ascii?Q?E+lOh8hLdwpBjclpGWR2RGTiJcoFP5YuYB/ZAzvQZ3uWSAw6RuYQbEkapqWb?=
 =?us-ascii?Q?if2tfoiXmDaarhKMj1BaUVAz/H28McgfZ52b7KEoWsfH2Q4Ec3V0nzTL32il?=
 =?us-ascii?Q?FYu+k1DOTtQUHSAhbWIPJSbaXanNoY8qRzlaO81Yu/qjNf9p8jOTBlDvZBrB?=
 =?us-ascii?Q?ZzJ/N42HC4KAD4SxTPd7isj9BFKAL+DKUoLSQ0E04wO8qlA2RUR6F9iNwJR2?=
 =?us-ascii?Q?MLh6tKKOapvWryioSdv+93Cpw1TZK+2Dm55TF+sxM5vw4xSICTX/EZ8tz2+Q?=
 =?us-ascii?Q?mKYyQ2ex8Q=3D=3D?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f14a4b02-a4a4-43ef-7580-08da36deb64d
X-MS-Exchange-CrossTenant-AuthSource: PSAPR06MB4021.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2022 01:52:19.8015
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: ZZPHT9hY0yeDKN8Kn3/OqXtno8Th/+Hr/Xa159bMnYUxtYPRP37scqLgez3RCh0WW9NRcHUjVRJW2upLYMGJ7w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR06MB4509
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

devm_kfree check the pointer, there is no need to check before
devm_kfree call.
This change is to cleanup the code a bit.

Signed-off-by: Bernard Zhao <bernard@vivo.com>
---
 drivers/net/ethernet/ti/am65-cpsw-qos.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/drivers/net/ethernet/ti/am65-cpsw-qos.c b/drivers/net/ethernet/ti/am65-cpsw-qos.c
index ebcc6386cc34..16b8794cb13c 100644
--- a/drivers/net/ethernet/ti/am65-cpsw-qos.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-qos.c
@@ -164,8 +164,7 @@ static void am65_cpsw_admin_to_oper(struct net_device *ndev)
 {
 	struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
 
-	if (port->qos.est_oper)
-		devm_kfree(&ndev->dev, port->qos.est_oper);
+	devm_kfree(&ndev->dev, port->qos.est_oper);
 
 	port->qos.est_oper = port->qos.est_admin;
 	port->qos.est_admin = NULL;
@@ -432,11 +431,8 @@ static void am65_cpsw_purge_est(struct net_device *ndev)
 
 	am65_cpsw_stop_est(ndev);
 
-	if (port->qos.est_admin)
-		devm_kfree(&ndev->dev, port->qos.est_admin);
-
-	if (port->qos.est_oper)
-		devm_kfree(&ndev->dev, port->qos.est_oper);
+	devm_kfree(&ndev->dev, port->qos.est_admin);
+	devm_kfree(&ndev->dev, port->qos.est_oper);
 
 	port->qos.est_oper = NULL;
 	port->qos.est_admin = NULL;
@@ -522,8 +518,7 @@ static int am65_cpsw_set_taprio(struct net_device *ndev, void *type_data)
 	ret = am65_cpsw_configure_taprio(ndev, est_new);
 	if (!ret) {
 		if (taprio->enable) {
-			if (port->qos.est_admin)
-				devm_kfree(&ndev->dev, port->qos.est_admin);
+			devm_kfree(&ndev->dev, port->qos.est_admin);
 
 			port->qos.est_admin = est_new;
 		} else {
-- 
2.33.1