lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ax88796: clean up probe and remove function

Browse Source 
This way we can remove the struct resource pointers from the private data.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
This commit is contained in:
Marc Kleine-Budde
2011-02-21 11:24:39 +01:00
parent a54dc58511
commit c9218c3a82
1 changed files with 31 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
drivers/net/ax88796.c
View File

@@ -87,8 +87,6 @@ struct ax_device {
u32 msg_enable; u32 msg_enable;
void __iomem *map2; void __iomem *map2;
struct resource *mem;
struct resource *mem2;
const struct ax_plat_data *plat; const struct ax_plat_data *plat;
unsigned char running; unsigned char running;
@@ -794,25 +792,24 @@ static int ax_init_dev(struct net_device *dev)
return ret; return ret;
} }
static int ax_remove(struct platform_device *_dev) static int ax_remove(struct platform_device *pdev)
{ {
struct net_device *dev = platform_get_drvdata(_dev); struct net_device *dev = platform_get_drvdata(pdev);
struct ei_device *ei_local = netdev_priv(dev); struct ei_device *ei_local = netdev_priv(dev);
struct ax_device *ax; struct ax_device *ax = to_ax_dev(dev);
struct resource *mem;
ax = to_ax_dev(dev);
unregister_netdev(dev); unregister_netdev(dev);
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
iounmap(ei_local->mem); iounmap(ei_local->mem);
release_resource(ax->mem); mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
kfree(ax->mem); release_mem_region(mem->start, resource_size(mem));
if (ax->map2) { if (ax->map2) {
iounmap(ax->map2); iounmap(ax->map2);
release_resource(ax->mem2); mem = platform_get_resource(pdev, IORESOURCE_MEM, 1);
kfree(ax->mem2); release_mem_region(mem->start, resource_size(mem));
} }
free_netdev(dev); free_netdev(dev);
@@ -832,8 +829,8 @@ static int ax_probe(struct platform_device *pdev)
struct net_device *dev; struct net_device *dev;
struct ei_device *ei_local; struct ei_device *ei_local;
struct ax_device *ax; struct ax_device *ax;
struct resource *res; struct resource *irq, *mem, *mem2;
size_t size; resource_size_t mem_size, mem2_size = 0;
int ret = 0; int ret = 0;
dev = ax__alloc_ei_netdev(sizeof(struct ax_device)); dev = ax__alloc_ei_netdev(sizeof(struct ax_device));
@@ -853,24 +850,24 @@ static int ax_probe(struct platform_device *pdev)
ei_local->rxcr_base = ax->plat->rcr_val; ei_local->rxcr_base = ax->plat->rcr_val;
/* find the platform resources */ /* find the platform resources */
res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
if (res == NULL) { if (!irq) {
dev_err(&pdev->dev, "no IRQ specified\n"); dev_err(&pdev->dev, "no IRQ specified\n");
ret = -ENXIO; ret = -ENXIO;
goto exit_mem; goto exit_mem;
} }
dev->irq = res->start; dev->irq = irq->start;
ax->irqflags = res->flags & IRQF_TRIGGER_MASK; ax->irqflags = irq->flags & IRQF_TRIGGER_MASK;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (res == NULL) { if (!mem) {
dev_err(&pdev->dev, "no MEM specified\n"); dev_err(&pdev->dev, "no MEM specified\n");
ret = -ENXIO; ret = -ENXIO;
goto exit_mem; goto exit_mem;
} }
size = (res->end - res->start) + 1; mem_size = resource_size(mem);
/* /*
* setup the register offsets from either the platform data or * setup the register offsets from either the platform data or
@@ -881,50 +878,43 @@ static int ax_probe(struct platform_device *pdev)
else { else {
ei_local->reg_offset = ax->reg_offsets; ei_local->reg_offset = ax->reg_offsets;
for (ret = 0; ret < 0x18; ret++) for (ret = 0; ret < 0x18; ret++)
ax->reg_offsets[ret] = (size / 0x18) * ret; ax->reg_offsets[ret] = (mem_size / 0x18) * ret;
} }
ax->mem = request_mem_region(res->start, size, pdev->name); if (!request_mem_region(mem->start, mem_size, pdev->name)) {
if (ax->mem == NULL) {
dev_err(&pdev->dev, "cannot reserve registers\n"); dev_err(&pdev->dev, "cannot reserve registers\n");
ret = -ENXIO; ret = -ENXIO;
goto exit_mem; goto exit_mem;
} }
ei_local->mem = ioremap(res->start, size); ei_local->mem = ioremap(mem->start, mem_size);
dev->base_addr = (unsigned long)ei_local->mem; dev->base_addr = (unsigned long)ei_local->mem;
if (ei_local->mem == NULL) { if (ei_local->mem == NULL) {
dev_err(&pdev->dev, "Cannot ioremap area (%08llx,%08llx)\n", dev_err(&pdev->dev, "Cannot ioremap area %pR\n", mem);
(unsigned long long)res->start,
(unsigned long long)res->end);
ret = -ENXIO; ret = -ENXIO;
goto exit_req; goto exit_req;
} }
/* look for reset area */ /* look for reset area */
mem2 = platform_get_resource(pdev, IORESOURCE_MEM, 1);
res = platform_get_resource(pdev, IORESOURCE_MEM, 1); if (!mem2) {
if (res == NULL) {
if (!ax->plat->reg_offsets) { if (!ax->plat->reg_offsets) {
for (ret = 0; ret < 0x20; ret++) for (ret = 0; ret < 0x20; ret++)
ax->reg_offsets[ret] = (size / 0x20) * ret; ax->reg_offsets[ret] = (mem_size / 0x20) * ret;
} }
ax->map2 = NULL;
} else { } else {
size = (res->end - res->start) + 1; mem2_size = resource_size(mem2);
ax->mem2 = request_mem_region(res->start, size, pdev->name); if (!request_mem_region(mem2->start, mem2_size, pdev->name)) {
if (ax->mem2 == NULL) {
dev_err(&pdev->dev, "cannot reserve registers\n"); dev_err(&pdev->dev, "cannot reserve registers\n");
ret = -ENXIO; ret = -ENXIO;
goto exit_mem1; goto exit_mem1;
} }
ax->map2 = ioremap(res->start, size); ax->map2 = ioremap(mem2->start, mem2_size);
if (ax->map2 == NULL) { if (!ax->map2) {
dev_err(&pdev->dev, "cannot map reset register\n"); dev_err(&pdev->dev, "cannot map reset register\n");
ret = -ENXIO; ret = -ENXIO;
goto exit_mem2; goto exit_mem2;
@@ -934,26 +924,23 @@ static int ax_probe(struct platform_device *pdev)
} }
/* got resources, now initialise and register device */ /* got resources, now initialise and register device */
ret = ax_init_dev(dev); ret = ax_init_dev(dev);
if (!ret) if (!ret)
return 0; return 0;
if (ax->map2 == NULL) if (!ax->map2)
goto exit_mem1; goto exit_mem1;
iounmap(ax->map2); iounmap(ax->map2);
exit_mem2: exit_mem2:
release_resource(ax->mem2); release_mem_region(mem2->start, mem2_size);
kfree(ax->mem2);
exit_mem1: exit_mem1:
iounmap(ei_local->mem); iounmap(ei_local->mem);
exit_req: exit_req:
release_resource(ax->mem); release_mem_region(mem->start, mem_size);
kfree(ax->mem);
exit_mem: exit_mem:
free_netdev(dev); free_netdev(dev);