Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed36edf8 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bcm63xx_enet-small-fixes-and-cleanups' 



Jonas Gorski says:

====================
bcm63xx_enet: small fixes and cleanups

This patch set fixes a few theoretical issues and cleans up the code a
bit. It also adds a bit more managed function usage to simplify clock
and iomem usage.

Based on net-next.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b80ccfe9 840f9223

drivers/net/ethernet/broadcom/bcm63xx_enet.c

+28 −50
Original line number Diff line number Diff line
@@ -1062,6 +1062,7 @@ static int bcm_enet_open(struct net_device *dev) 
	val = enet_readl(priv, ENET_CTL_REG);

	val |= ENET_CTL_ENABLE_MASK;

	enet_writel(priv, val, ENET_CTL_REG);

	if (priv->dma_has_sram)

		enet_dma_writel(priv, ENETDMA_CFG_EN_MASK, ENETDMA_CFG_REG);

	enet_dmac_writel(priv, priv->dma_chan_en_mask,

			 ENETDMAC_CHANCFG, priv->rx_chan);
@@ -1721,10 +1722,8 @@ static int bcm_enet_probe(struct platform_device *pdev) 
	const char *clk_name;

	int i, ret;



	/* stop if shared driver failed, assume driver->probe will be

	 * called in the same order we register devices (correct ?) */

	if (!bcm_enet_shared_base[0])

		return -ENODEV;

		return -EPROBE_DEFER;



	res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

	res_irq_rx = platform_get_resource(pdev, IORESOURCE_IRQ, 1);
@@ -1768,12 +1767,14 @@ static int bcm_enet_probe(struct platform_device *pdev) 
		clk_name = "enet1";

	}



	priv->mac_clk = clk_get(&pdev->dev, clk_name);

	priv->mac_clk = devm_clk_get(&pdev->dev, clk_name);

	if (IS_ERR(priv->mac_clk)) {

		ret = PTR_ERR(priv->mac_clk);

		goto out;

	}

	clk_prepare_enable(priv->mac_clk);

	ret = clk_prepare_enable(priv->mac_clk);

	if (ret)

		goto out;



	/* initialize default and fetch platform data */

	priv->rx_ring_size = BCMENET_DEF_RX_DESC;
@@ -1801,13 +1802,15 @@ static int bcm_enet_probe(struct platform_device *pdev) 


	if (priv->mac_id == 0 && priv->has_phy && !priv->use_external_mii) {

		/* using internal PHY, enable clock */

		priv->phy_clk = clk_get(&pdev->dev, "ephy");

		priv->phy_clk = devm_clk_get(&pdev->dev, "ephy");

		if (IS_ERR(priv->phy_clk)) {

			ret = PTR_ERR(priv->phy_clk);

			priv->phy_clk = NULL;

			goto out_put_clk_mac;

			goto out_disable_clk_mac;

		}

		clk_prepare_enable(priv->phy_clk);

		ret = clk_prepare_enable(priv->phy_clk);

		if (ret)

			goto out_disable_clk_mac;

	}



	/* do minimal hardware init to be able to probe mii bus */
@@ -1900,14 +1903,10 @@ static int bcm_enet_probe(struct platform_device *pdev) 
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_put(priv->phy_clk);

	}



out_put_clk_mac:

out_disable_clk_mac:

	clk_disable_unprepare(priv->mac_clk);

	clk_put(priv->mac_clk);

out:

	free_netdev(dev);

	return ret;
@@ -1943,12 +1942,8 @@ static int bcm_enet_remove(struct platform_device *pdev) 
	}



	/* disable hw block clocks */

	if (priv->phy_clk) {

	clk_disable_unprepare(priv->phy_clk);

		clk_put(priv->phy_clk);

	}

	clk_disable_unprepare(priv->mac_clk);

	clk_put(priv->mac_clk);



	free_netdev(dev);

	return 0;
@@ -2688,11 +2683,8 @@ static int bcm_enetsw_probe(struct platform_device *pdev) 
	struct resource *res_mem;

	int ret, irq_rx, irq_tx;



	/* stop if shared driver failed, assume driver->probe will be

	 * called in the same order we register devices (correct ?)

	 */

	if (!bcm_enet_shared_base[0])

		return -ENODEV;

		return -EPROBE_DEFER;



	res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	irq_rx = platform_get_irq(pdev, 0);
@@ -2731,24 +2723,20 @@ static int bcm_enetsw_probe(struct platform_device *pdev) 
	if (ret)

		goto out;



	if (!request_mem_region(res_mem->start, resource_size(res_mem),

				"bcm63xx_enetsw")) {

		ret = -EBUSY;

	priv->base = devm_ioremap_resource(&pdev->dev, res_mem);

	if (IS_ERR(priv->base)) {

		ret = PTR_ERR(priv->base);

		goto out;

	}



	priv->base = ioremap(res_mem->start, resource_size(res_mem));

	if (priv->base == NULL) {

		ret = -ENOMEM;

		goto out_release_mem;

	}



	priv->mac_clk = clk_get(&pdev->dev, "enetsw");

	priv->mac_clk = devm_clk_get(&pdev->dev, "enetsw");

	if (IS_ERR(priv->mac_clk)) {

		ret = PTR_ERR(priv->mac_clk);

		goto out_unmap;

		goto out;

	}

	clk_enable(priv->mac_clk);

	ret = clk_prepare_enable(priv->mac_clk);

	if (ret)

		goto out;



	priv->rx_chan = 0;

	priv->tx_chan = 1;
@@ -2769,7 +2757,7 @@ static int bcm_enetsw_probe(struct platform_device *pdev) 


	ret = register_netdev(dev);

	if (ret)

		goto out_put_clk;

		goto out_disable_clk;



	netif_carrier_off(dev);

	platform_set_drvdata(pdev, dev);
@@ -2778,14 +2766,8 @@ static int bcm_enetsw_probe(struct platform_device *pdev) 


	return 0;



out_put_clk:

	clk_put(priv->mac_clk);



out_unmap:

	iounmap(priv->base);



out_release_mem:

	release_mem_region(res_mem->start, resource_size(res_mem));

out_disable_clk:

	clk_disable_unprepare(priv->mac_clk);

out:

	free_netdev(dev);

	return ret;
@@ -2797,17 +2779,13 @@ static int bcm_enetsw_remove(struct platform_device *pdev) 
{

	struct bcm_enet_priv *priv;

	struct net_device *dev;

	struct resource *res;



	/* stop netdevice */

	dev = platform_get_drvdata(pdev);

	priv = netdev_priv(dev);

	unregister_netdev(dev);



	/* release device resources */

	iounmap(priv->base);

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	release_mem_region(res->start, resource_size(res));

	clk_disable_unprepare(priv->mac_clk);



	free_netdev(dev);

	return 0;

drivers/net/ethernet/broadcom/bcm63xx_enet.h

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
#include <linux/platform_device.h>



#include <bcm63xx_regs.h>

#include <bcm63xx_irq.h>

#include <bcm63xx_io.h>

#include <bcm63xx_iudma.h>