ARM: 9121/1: amba: Drop unused functions about APB/AHB devices add

No one use the following functions, kill them.

  amba_aphb_device_add()
  amba_apb_device_add()
  amba_apb_device_add_res()
  amba_ahb_device_add()
  amba_ahb_device_add_res()

Cc: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>

diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index 9620411..2f21375 100644 (file)
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -579,78 +579,6 @@ int amba_device_add(struct amba_device *dev, struct resource *parent)
 }
 EXPORT_SYMBOL_GPL(amba_device_add);
 
-static struct amba_device *
-amba_aphb_device_add(struct device *parent, const char *name,
-                    resource_size_t base, size_t size, int irq1, int irq2,
-                    void *pdata, unsigned int periphid, u64 dma_mask,
-                    struct resource *resbase)
-{
-       struct amba_device *dev;
-       int ret;
-
-       dev = amba_device_alloc(name, base, size);
-       if (!dev)
-               return ERR_PTR(-ENOMEM);
-
-       dev->dev.coherent_dma_mask = dma_mask;
-       dev->irq[0] = irq1;
-       dev->irq[1] = irq2;
-       dev->periphid = periphid;
-       dev->dev.platform_data = pdata;
-       dev->dev.parent = parent;
-
-       ret = amba_device_add(dev, resbase);
-       if (ret) {
-               amba_device_put(dev);
-               return ERR_PTR(ret);
-       }
-
-       return dev;
-}
-
-struct amba_device *
-amba_apb_device_add(struct device *parent, const char *name,
-                   resource_size_t base, size_t size, int irq1, int irq2,
-                   void *pdata, unsigned int periphid)
-{
-       return amba_aphb_device_add(parent, name, base, size, irq1, irq2, pdata,
-                                   periphid, 0, &iomem_resource);
-}
-EXPORT_SYMBOL_GPL(amba_apb_device_add);
-
-struct amba_device *
-amba_ahb_device_add(struct device *parent, const char *name,
-                   resource_size_t base, size_t size, int irq1, int irq2,
-                   void *pdata, unsigned int periphid)
-{
-       return amba_aphb_device_add(parent, name, base, size, irq1, irq2, pdata,
-                                   periphid, ~0ULL, &iomem_resource);
-}
-EXPORT_SYMBOL_GPL(amba_ahb_device_add);
-
-struct amba_device *
-amba_apb_device_add_res(struct device *parent, const char *name,
-                       resource_size_t base, size_t size, int irq1,
-                       int irq2, void *pdata, unsigned int periphid,
-                       struct resource *resbase)
-{
-       return amba_aphb_device_add(parent, name, base, size, irq1, irq2, pdata,
-                                   periphid, 0, resbase);
-}
-EXPORT_SYMBOL_GPL(amba_apb_device_add_res);
-
-struct amba_device *
-amba_ahb_device_add_res(struct device *parent, const char *name,
-                       resource_size_t base, size_t size, int irq1,
-                       int irq2, void *pdata, unsigned int periphid,
-                       struct resource *resbase)
-{
-       return amba_aphb_device_add(parent, name, base, size, irq1, irq2, pdata,
-                                   periphid, ~0ULL, resbase);
-}
-EXPORT_SYMBOL_GPL(amba_ahb_device_add_res);
-
-
 static void amba_device_initialize(struct amba_device *dev, const char *name)
 {
        device_initialize(&dev->dev);

diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h
index c68d87b..edfcf7a 100644 (file)
--- a/include/linux/amba/bus.h
+++ b/include/linux/amba/bus.h
@@ -122,24 +122,6 @@ struct amba_device *amba_device_alloc(const char *, resource_size_t, size_t);
 void amba_device_put(struct amba_device *);
 int amba_device_add(struct amba_device *, struct resource *);
 int amba_device_register(struct amba_device *, struct resource *);
-struct amba_device *amba_apb_device_add(struct device *parent, const char *name,
-                                       resource_size_t base, size_t size,
-                                       int irq1, int irq2, void *pdata,
-                                       unsigned int periphid);
-struct amba_device *amba_ahb_device_add(struct device *parent, const char *name,
-                                       resource_size_t base, size_t size,
-                                       int irq1, int irq2, void *pdata,
-                                       unsigned int periphid);
-struct amba_device *
-amba_apb_device_add_res(struct device *parent, const char *name,
-                       resource_size_t base, size_t size, int irq1,
-                       int irq2, void *pdata, unsigned int periphid,
-                       struct resource *resbase);
-struct amba_device *
-amba_ahb_device_add_res(struct device *parent, const char *name,
-                       resource_size_t base, size_t size, int irq1,
-                       int irq2, void *pdata, unsigned int periphid,
-                       struct resource *resbase);
 void amba_device_unregister(struct amba_device *);
 struct amba_device *amba_find_device(const char *, struct device *, unsigned int, unsigned int);
 int amba_request_regions(struct amba_device *, const char *);