From: "Lothar Waßmann" <LW@KARO-electronics.de>
To: "Andrew Lunn" <andrew@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
"Fabio Estevam" <fabio.estevam@freescale.com>,
"Greg Ungerer" <gerg@uclinux.org>,
"Kevin Hao" <haokexin@gmail.com>,
"Lothar Waßmann" <LW@KARO-electronics.de>,
"Lucas Stach" <l.stach@pengutronix.de>,
"Nimrod Andy" <B38611@freescale.com>,
"Philippe Reynes" <tremyfr@gmail.com>,
"Richard Cochran" <richardcochran@gmail.com>,
"Russell King" <rmk+kernel@arm.linux.org.uk>,
"Sascha Hauer" <s.hauer@pengutronix.de>,
"Stefan Agner" <stefan@agner.ch>,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
"Jeff Kirsher" <jeffrey.t.kirsher@intel.com>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Subject: [PATCH 1/3] net: fec: Remove redundant checks for NULL clk pointer
Date: Mon, 30 Nov 2015 12:32:46 +0100 [thread overview]
Message-ID: <1448883168-30742-2-git-send-email-LW@KARO-electronics.de> (raw)
In-Reply-To: <1448883168-30742-1-git-send-email-LW@KARO-electronics.de>
NULL is a valid argument to clk_enable()/clk_disable(). Remove
redundant checks before calling those functions.
Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
---
drivers/net/ethernet/freescale/fec_main.c | 23 +++++++++--------------
1 file changed, 9 insertions(+), 14 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index d2328fc..e17d74f 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -1873,35 +1873,30 @@ static int fec_enet_clk_enable(struct net_device *ndev, bool enable)
}
mutex_unlock(&fep->ptp_clk_mutex);
}
- if (fep->clk_ref) {
- ret = clk_prepare_enable(fep->clk_ref);
- if (ret)
- goto failed_clk_ref;
- }
+
+ ret = clk_prepare_enable(fep->clk_ref);
+ if (ret)
+ goto failed_clk_ref;
} else {
clk_disable_unprepare(fep->clk_ahb);
- if (fep->clk_enet_out)
- clk_disable_unprepare(fep->clk_enet_out);
+ clk_disable_unprepare(fep->clk_enet_out);
if (fep->clk_ptp) {
mutex_lock(&fep->ptp_clk_mutex);
clk_disable_unprepare(fep->clk_ptp);
fep->ptp_clk_on = false;
mutex_unlock(&fep->ptp_clk_mutex);
}
- if (fep->clk_ref)
- clk_disable_unprepare(fep->clk_ref);
+ clk_disable_unprepare(fep->clk_ref);
}
return 0;
failed_clk_ref:
- if (fep->clk_ref)
- clk_disable_unprepare(fep->clk_ref);
+ clk_disable_unprepare(fep->clk_ref);
failed_clk_ptp:
- if (fep->clk_enet_out)
- clk_disable_unprepare(fep->clk_enet_out);
+ clk_disable_unprepare(fep->clk_enet_out);
failed_clk_enet_out:
- clk_disable_unprepare(fep->clk_ahb);
+ clk_disable_unprepare(fep->clk_ahb);
return ret;
}
--
2.1.4
next prev parent reply other threads:[~2015-11-30 11:32 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-30 11:32 [PATCH 0/3] net: fec: Reset ethernet PHY whenever the enet_out clock Lothar Waßmann
2015-11-30 11:32 ` Lothar Waßmann [this message]
2015-11-30 11:32 ` [PATCH 2/3] net: fec: convert to using gpiod framework Lothar Waßmann
2015-11-30 11:32 ` [PATCH 3/3] net: fec: Reset ethernet PHY whenever the enet_out clock is being enabled Lothar Waßmann
2015-12-01 2:31 ` Duan Andy
2015-11-30 12:17 ` [PATCH 2/3] net: fec: convert to using gpiod framework Fabio Estevam
2015-12-01 2:17 ` Duan Andy
2015-12-01 10:29 ` Lothar Waßmann
2015-12-01 2:04 ` [PATCH 1/3] net: fec: Remove redundant checks for NULL clk pointer Duan Andy
2015-12-01 7:24 ` Lothar Waßmann
2015-12-01 1:52 ` [PATCH 0/3] net: fec: Reset ethernet PHY whenever the enet_out clock Duan Andy
2015-12-01 7:24 ` Lothar Waßmann
2015-12-01 7:33 ` Duan Andy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1448883168-30742-2-git-send-email-LW@KARO-electronics.de \
--to=lw@karo-electronics.de \
--cc=B38611@freescale.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=fabio.estevam@freescale.com \
--cc=gerg@uclinux.org \
--cc=haokexin@gmail.com \
--cc=jeffrey.t.kirsher@intel.com \
--cc=l.stach@pengutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=richardcochran@gmail.com \
--cc=rmk+kernel@arm.linux.org.uk \
--cc=s.hauer@pengutronix.de \
--cc=stefan@agner.ch \
--cc=tremyfr@gmail.com \
--cc=u.kleine-koenig@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox