From 2653c57a69805ec579d4aa2c25560b6b18c9ed98 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 18 Dec 2011 11:20:37 +0000 Subject: [PATCH] --- yaml --- r: 295343 b: refs/heads/master c: 9a25706b71ea06c3e2cfd165ebf98a5557ecdd0e h: refs/heads/master i: 295341: 94077c40a8a2e04015e3d187953b69d313cbdf35 295339: 60a256e2e5675c72fbfdfeaf64c9cd5e1bf20388 295335: 7ee68273dde3de3ed1cc5ed9afd2c87c2d741aac 295327: 8828596bdaf4992e53f04a51e3f92b88c66b40d8 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-integrator/impd1.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index edb7d9aa20bf..e11e20e0431c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 46d4bb9b52829c7d94c528201f27f6288be3f45e +refs/heads/master: 9a25706b71ea06c3e2cfd165ebf98a5557ecdd0e diff --git a/trunk/arch/arm/mach-integrator/impd1.c b/trunk/arch/arm/mach-integrator/impd1.c index 8cbb75a96bd4..3e538da6cb1f 100644 --- a/trunk/arch/arm/mach-integrator/impd1.c +++ b/trunk/arch/arm/mach-integrator/impd1.c @@ -401,24 +401,21 @@ static int impd1_probe(struct lm_device *dev) pc_base = dev->resource.start + idev->offset; - d = kzalloc(sizeof(struct amba_device), GFP_KERNEL); + d = amba_device_alloc(NULL, pc_base, SZ_4K); if (!d) continue; dev_set_name(&d->dev, "lm%x:%5.5lx", dev->id, idev->offset >> 12); d->dev.parent = &dev->dev; - d->res.start = dev->resource.start + idev->offset; - d->res.end = d->res.start + SZ_4K - 1; - d->res.flags = IORESOURCE_MEM; d->irq[0] = dev->irq; d->irq[1] = dev->irq; d->periphid = idev->id; d->dev.platform_data = idev->platform_data; - ret = amba_device_register(d, &dev->resource); + ret = amba_device_add(d, &dev->resource); if (ret) { dev_err(&d->dev, "unable to register device: %d\n", ret); - kfree(d); + amba_device_put(d); } }