aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2011-11-13 11:27:01 +0000
committerGabor Juhos <juhosg@openwrt.org>2011-11-13 11:27:01 +0000
commit34015ed6e8ccb40ef40091ac0084c70e13e4c160 (patch)
tree98d016a4a7e869742c55a7241155e02c4dfc426d /target
parent2d882cff23e00ef526a93af4a7d49f2f12f341a4 (diff)
downloadupstream-34015ed6e8ccb40ef40091ac0084c70e13e4c160.tar.gz
upstream-34015ed6e8ccb40ef40091ac0084c70e13e4c160.tar.bz2
upstream-34015ed6e8ccb40ef40091ac0084c70e13e4c160.zip
ar71xx: ag71xx: remove unused mii_ctrl field from struct ag71xx
SVN-Revision: 29015
Diffstat (limited to 'target')
-rw-r--r--target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h1
-rw-r--r--target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c19
2 files changed, 1 insertions, 19 deletions
diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
index 067307026b..97e5fb2840 100644
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
@@ -140,7 +140,6 @@ struct ag71xx_debug {
struct ag71xx {
void __iomem *mac_base;
- void __iomem *mii_ctrl;
spinlock_t lock;
struct platform_device *pdev;
diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
index 5740549c2b..3ebf4b171e 100644
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
@@ -1114,27 +1114,13 @@ static int __devinit ag71xx_probe(struct platform_device *pdev)
goto err_free_dev;
}
- res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mii_ctrl");
- if (!res) {
- dev_err(&pdev->dev, "no mii_ctrl resource found\n");
- err = -ENXIO;
- goto err_unmap_base;
- }
-
- ag->mii_ctrl = ioremap_nocache(res->start, res->end - res->start + 1);
- if (!ag->mii_ctrl) {
- dev_err(&pdev->dev, "unable to ioremap mii_ctrl\n");
- err = -ENOMEM;
- goto err_unmap_base;
- }
-
dev->irq = platform_get_irq(pdev, 0);
err = request_irq(dev->irq, ag71xx_interrupt,
IRQF_DISABLED,
dev->name, dev);
if (err) {
dev_err(&pdev->dev, "unable to request IRQ %d\n", dev->irq);
- goto err_unmap_mii_ctrl;
+ goto err_unmap_base;
}
dev->base_addr = (unsigned long)ag->mac_base;
@@ -1200,8 +1186,6 @@ err_free_desc:
ag->stop_desc_dma);
err_free_irq:
free_irq(dev->irq, dev);
-err_unmap_mii_ctrl:
- iounmap(ag->mii_ctrl);
err_unmap_base:
iounmap(ag->mac_base);
err_free_dev:
@@ -1222,7 +1206,6 @@ static int __devexit ag71xx_remove(struct platform_device *pdev)
ag71xx_phy_disconnect(ag);
unregister_netdev(dev);
free_irq(dev->irq, dev);
- iounmap(ag->mii_ctrl);
iounmap(ag->mac_base);
kfree(dev);
platform_set_drvdata(pdev, NULL);