mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 00:41:17 +00:00
e7bfda2c24
This change makes the names of Broadcom targets consistent by using the common notation based on SoC/CPU ID (which is used internally anyway), bcmXXXX instead of brcmXXXX. This is even used for target TITLE in make menuconfig already, only the short target name used brcm so far. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
From 555baec974ede81e616ca88ac6d3fca09239368f Mon Sep 17 00:00:00 2001
|
|
From: Jonas Gorski <jonas.gorski@gmail.com>
|
|
Date: Tue, 18 Jul 2017 13:18:01 +0200
|
|
Subject: [PATCH 5/6] bcm63xx_enet: drop unneeded NULL phy_clk check
|
|
|
|
clk_disable and clk_unprepare are NULL-safe, so need to duplicate the
|
|
NULL check of the functions.
|
|
|
|
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
|
|
---
|
|
drivers/net/ethernet/broadcom/bcm63xx_enet.c | 7 ++-----
|
|
1 file changed, 2 insertions(+), 5 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
|
|
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
|
|
@@ -1905,8 +1905,7 @@ out_free_mdio:
|
|
out_uninit_hw:
|
|
/* turn off mdc clock */
|
|
enet_writel(priv, 0, ENET_MIISC_REG);
|
|
- if (priv->phy_clk)
|
|
- clk_disable_unprepare(priv->phy_clk);
|
|
+ clk_disable_unprepare(priv->phy_clk);
|
|
|
|
out_disable_clk_mac:
|
|
clk_disable_unprepare(priv->mac_clk);
|
|
@@ -1945,9 +1944,7 @@ static int bcm_enet_remove(struct platfo
|
|
}
|
|
|
|
/* disable hw block clocks */
|
|
- if (priv->phy_clk)
|
|
- clk_disable_unprepare(priv->phy_clk);
|
|
-
|
|
+ clk_disable_unprepare(priv->phy_clk);
|
|
clk_disable_unprepare(priv->mac_clk);
|
|
|
|
free_netdev(dev);
|