[PATCH v2 3/4] amba: Kill sysfs attribute file of irq
From: Kefeng Wang <hidden>
Date: 2021-08-27 15:02:27
Also in:
linux-devicetree, lkml
Subsystem:
arm primecell bus support, the rest · Maintainers:
Russell King, Linus Torvalds
As Rob said[1], there doesn't seem to be any users about the sysfs attribute file of irq[0] and irq[1]. And we don't need to include <asm/irq.h> as NO_IRQ has gone. Let's kill both of them. [1] https://lkml.org/lkml/2021/8/25/461 Signed-off-by: Kefeng Wang <redacted> --- drivers/amba/bus.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index 37fcd5592c6f..4d3a565ca079 100644
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c@@ -20,8 +20,6 @@ #include <linux/platform_device.h> #include <linux/reset.h> -#include <asm/irq.h> - #define to_amba_driver(d) container_of(d, struct amba_driver, drv) /* called on periphid match and class 0x9 coresight device. */
@@ -135,8 +133,6 @@ static ssize_t name##_show(struct device *_dev, \ static DEVICE_ATTR_RO(name) amba_attr_func(id, "%08x\n", dev->periphid); -amba_attr_func(irq0, "%u\n", dev->irq[0]); -amba_attr_func(irq1, "%u\n", dev->irq[1]); amba_attr_func(resource, "\t%016llx\t%016llx\t%016lx\n", (unsigned long long)dev->res.start, (unsigned long long)dev->res.end, dev->res.flags);
@@ -463,20 +459,10 @@ static int amba_device_try_add(struct amba_device *dev, struct resource *parent) skip_probe: ret = device_add(&dev->dev); - if (ret) - goto err_release; - - if (dev->irq[0]) - ret = device_create_file(&dev->dev, &dev_attr_irq0); - if (ret == 0 && dev->irq[1]) - ret = device_create_file(&dev->dev, &dev_attr_irq1); - if (ret == 0) - return ret; - - device_unregister(&dev->dev); err_release: - release_resource(&dev->res); + if (ret) + release_resource(&dev->res); err_out: return ret;
--
2.18.0.huawei.25
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel