* [PATCH 1/3] bcm63xx_enet: use managed io memory allocations
@ 2013-03-10 13:57 Jonas Gorski
2013-03-10 13:57 ` [PATCH 2/3] bcm63xx_enet: use managed " Jonas Gorski
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Jonas Gorski @ 2013-03-10 13:57 UTC (permalink / raw)
To: netdev; +Cc: David S. Miller, Maxime Bizon, Florian Fainelli, Kevin Cernekee
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
---
drivers/net/ethernet/broadcom/bcm63xx_enet.c | 43 +++++---------------------
1 file changed, 7 insertions(+), 36 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
index 842f983..0a43188 100644
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -1634,7 +1634,6 @@ static int bcm_enet_probe(struct platform_device *pdev)
struct resource *res_mem, *res_irq, *res_irq_rx, *res_irq_tx;
struct mii_bus *bus;
const char *clk_name;
- unsigned int iomem_size;
int i, ret;
/* stop if shared driver failed, assume driver->probe will be
@@ -1659,17 +1658,12 @@ static int bcm_enet_probe(struct platform_device *pdev)
if (ret)
goto out;
- iomem_size = resource_size(res_mem);
- if (!request_mem_region(res_mem->start, iomem_size, "bcm63xx_enet")) {
- ret = -EBUSY;
- goto out;
- }
-
- priv->base = ioremap(res_mem->start, iomem_size);
+ priv->base = devm_request_and_ioremap(&pdev->dev, res_mem);
if (priv->base == NULL) {
ret = -ENOMEM;
- goto out_release_mem;
+ goto out;
}
+
dev->irq = priv->irq = res_irq->start;
priv->irq_rx = res_irq_rx->start;
priv->irq_tx = res_irq_tx->start;
@@ -1689,7 +1683,7 @@ static int bcm_enet_probe(struct platform_device *pdev)
priv->mac_clk = clk_get(&pdev->dev, clk_name);
if (IS_ERR(priv->mac_clk)) {
ret = PTR_ERR(priv->mac_clk);
- goto out_unmap;
+ goto out;
}
clk_enable(priv->mac_clk);
@@ -1829,12 +1823,6 @@ out_uninit_hw:
out_put_clk_mac:
clk_disable(priv->mac_clk);
clk_put(priv->mac_clk);
-
-out_unmap:
- iounmap(priv->base);
-
-out_release_mem:
- release_mem_region(res_mem->start, iomem_size);
out:
free_netdev(dev);
return ret;
@@ -1848,7 +1836,6 @@ static int bcm_enet_remove(struct platform_device *pdev)
{
struct bcm_enet_priv *priv;
struct net_device *dev;
- struct resource *res;
/* stop netdevice */
dev = platform_get_drvdata(pdev);
@@ -1871,11 +1858,6 @@ static int bcm_enet_remove(struct platform_device *pdev)
bcm_enet_mdio_write_mii);
}
- /* release device resources */
- iounmap(priv->base);
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- release_mem_region(res->start, resource_size(res));
-
/* disable hw block clocks */
if (priv->phy_clk) {
clk_disable(priv->phy_clk);
@@ -1904,31 +1886,20 @@ struct platform_driver bcm63xx_enet_driver = {
static int bcm_enet_shared_probe(struct platform_device *pdev)
{
struct resource *res;
- unsigned int iomem_size;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res)
return -ENODEV;
- iomem_size = resource_size(res);
- if (!request_mem_region(res->start, iomem_size, "bcm63xx_enet_dma"))
- return -EBUSY;
-
- bcm_enet_shared_base = ioremap(res->start, iomem_size);
- if (!bcm_enet_shared_base) {
- release_mem_region(res->start, iomem_size);
+ bcm_enet_shared_base = devm_request_and_ioremap(&pdev->dev, res);
+ if (!bcm_enet_shared_base)
return -ENOMEM;
- }
+
return 0;
}
static int bcm_enet_shared_remove(struct platform_device *pdev)
{
- struct resource *res;
-
- iounmap(bcm_enet_shared_base);
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- release_mem_region(res->start, resource_size(res));
return 0;
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/3] bcm63xx_enet: use managed memory allocations
2013-03-10 13:57 [PATCH 1/3] bcm63xx_enet: use managed io memory allocations Jonas Gorski
@ 2013-03-10 13:57 ` Jonas Gorski
2013-03-10 13:57 ` [PATCH 3/3] bcm63xx_enet: properly prepare/unprepare clocks before/after usage Jonas Gorski
2013-03-10 19:59 ` [PATCH 1/3] bcm63xx_enet: use managed io memory allocations Kevin Cernekee
2 siblings, 0 replies; 5+ messages in thread
From: Jonas Gorski @ 2013-03-10 13:57 UTC (permalink / raw)
To: netdev; +Cc: David S. Miller, Maxime Bizon, Florian Fainelli, Kevin Cernekee
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
---
drivers/net/ethernet/broadcom/bcm63xx_enet.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
index 0a43188..8397d1c 100644
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -1742,7 +1742,8 @@ static int bcm_enet_probe(struct platform_device *pdev)
* if a slave is not present on hw */
bus->phy_mask = ~(1 << priv->phy_id);
- bus->irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);
+ bus->irq = devm_kzalloc(&pdev->dev, sizeof(int) * PHY_MAX_ADDR,
+ GFP_KERNEL);
if (!bus->irq) {
ret = -ENOMEM;
goto out_free_mdio;
@@ -1803,10 +1804,8 @@ static int bcm_enet_probe(struct platform_device *pdev)
return 0;
out_unregister_mdio:
- if (priv->mii_bus) {
+ if (priv->mii_bus)
mdiobus_unregister(priv->mii_bus);
- kfree(priv->mii_bus->irq);
- }
out_free_mdio:
if (priv->mii_bus)
@@ -1847,7 +1846,6 @@ static int bcm_enet_remove(struct platform_device *pdev)
if (priv->has_phy) {
mdiobus_unregister(priv->mii_bus);
- kfree(priv->mii_bus->irq);
mdiobus_free(priv->mii_bus);
} else {
struct bcm63xx_enet_platform_data *pd;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] bcm63xx_enet: properly prepare/unprepare clocks before/after usage
2013-03-10 13:57 [PATCH 1/3] bcm63xx_enet: use managed io memory allocations Jonas Gorski
2013-03-10 13:57 ` [PATCH 2/3] bcm63xx_enet: use managed " Jonas Gorski
@ 2013-03-10 13:57 ` Jonas Gorski
2013-03-10 19:59 ` [PATCH 1/3] bcm63xx_enet: use managed io memory allocations Kevin Cernekee
2 siblings, 0 replies; 5+ messages in thread
From: Jonas Gorski @ 2013-03-10 13:57 UTC (permalink / raw)
To: netdev; +Cc: David S. Miller, Maxime Bizon, Florian Fainelli, Kevin Cernekee
Use clk_prepare_enable/disable_unprepare calls in preparation for
switching to the generic clock framework.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
---
drivers/net/ethernet/broadcom/bcm63xx_enet.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
index 8397d1c..aff3866 100644
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -1685,7 +1685,7 @@ static int bcm_enet_probe(struct platform_device *pdev)
ret = PTR_ERR(priv->mac_clk);
goto out;
}
- clk_enable(priv->mac_clk);
+ clk_prepare_enable(priv->mac_clk);
/* initialize default and fetch platform data */
priv->rx_ring_size = BCMENET_DEF_RX_DESC;
@@ -1714,7 +1714,7 @@ static int bcm_enet_probe(struct platform_device *pdev)
priv->phy_clk = NULL;
goto out_put_clk_mac;
}
- clk_enable(priv->phy_clk);
+ clk_prepare_enable(priv->phy_clk);
}
/* do minimal hardware init to be able to probe mii bus */
@@ -1815,12 +1815,12 @@ out_uninit_hw:
/* turn off mdc clock */
enet_writel(priv, 0, ENET_MIISC_REG);
if (priv->phy_clk) {
- clk_disable(priv->phy_clk);
+ clk_disable_unprepare(priv->phy_clk);
clk_put(priv->phy_clk);
}
out_put_clk_mac:
- clk_disable(priv->mac_clk);
+ clk_disable_unprepare(priv->mac_clk);
clk_put(priv->mac_clk);
out:
free_netdev(dev);
@@ -1858,10 +1858,10 @@ static int bcm_enet_remove(struct platform_device *pdev)
/* disable hw block clocks */
if (priv->phy_clk) {
- clk_disable(priv->phy_clk);
+ clk_disable_unprepare(priv->phy_clk);
clk_put(priv->phy_clk);
}
- clk_disable(priv->mac_clk);
+ clk_disable_unprepare(priv->mac_clk);
clk_put(priv->mac_clk);
platform_set_drvdata(pdev, NULL);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/3] bcm63xx_enet: use managed io memory allocations
2013-03-10 13:57 [PATCH 1/3] bcm63xx_enet: use managed io memory allocations Jonas Gorski
2013-03-10 13:57 ` [PATCH 2/3] bcm63xx_enet: use managed " Jonas Gorski
2013-03-10 13:57 ` [PATCH 3/3] bcm63xx_enet: properly prepare/unprepare clocks before/after usage Jonas Gorski
@ 2013-03-10 19:59 ` Kevin Cernekee
2013-03-10 20:57 ` David Miller
2 siblings, 1 reply; 5+ messages in thread
From: Kevin Cernekee @ 2013-03-10 19:59 UTC (permalink / raw)
To: Jonas Gorski; +Cc: netdev, David S. Miller, Maxime Bizon, Florian Fainelli
On Sun, Mar 10, 2013 at 6:57 AM, Jonas Gorski <jogo@openwrt.org> wrote:
> Signed-off-by: Jonas Gorski <jogo@openwrt.org>
> ---
> drivers/net/ethernet/broadcom/bcm63xx_enet.c | 43 +++++---------------------
> 1 file changed, 7 insertions(+), 36 deletions(-)
>
> diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
For the whole series:
Acked-by: Kevin Cernekee <cernekee@gmail.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/3] bcm63xx_enet: use managed io memory allocations
2013-03-10 19:59 ` [PATCH 1/3] bcm63xx_enet: use managed io memory allocations Kevin Cernekee
@ 2013-03-10 20:57 ` David Miller
0 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2013-03-10 20:57 UTC (permalink / raw)
To: cernekee; +Cc: jogo, netdev, mbizon, florian
From: Kevin Cernekee <cernekee@gmail.com>
Date: Sun, 10 Mar 2013 12:59:38 -0700
> On Sun, Mar 10, 2013 at 6:57 AM, Jonas Gorski <jogo@openwrt.org> wrote:
>> Signed-off-by: Jonas Gorski <jogo@openwrt.org>
>> ---
>> drivers/net/ethernet/broadcom/bcm63xx_enet.c | 43 +++++---------------------
>> 1 file changed, 7 insertions(+), 36 deletions(-)
>>
>> diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
>
> For the whole series:
>
> Acked-by: Kevin Cernekee <cernekee@gmail.com>
Series applied to net-next, thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-03-10 20:57 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-10 13:57 [PATCH 1/3] bcm63xx_enet: use managed io memory allocations Jonas Gorski
2013-03-10 13:57 ` [PATCH 2/3] bcm63xx_enet: use managed " Jonas Gorski
2013-03-10 13:57 ` [PATCH 3/3] bcm63xx_enet: properly prepare/unprepare clocks before/after usage Jonas Gorski
2013-03-10 19:59 ` [PATCH 1/3] bcm63xx_enet: use managed io memory allocations Kevin Cernekee
2013-03-10 20:57 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).