summaryrefslogtreecommitdiff
path: root/drivers/amba
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2018-04-10 15:21:43 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-05-02 07:53:42 -0700
commit0448fd9403b4d77bd4aebc4e892db871d74850c8 (patch)
treeb9156dd3b1438d7c0d416141c38d8d5db795a6eb /drivers/amba
parent634602948de7dd0e04a0160f7d24eaad2eaa2b01 (diff)
ARM: amba: Make driver_override output consistent with other buses
commit 5f53624662eaac89598641cee6cd54fc192572d9 upstream. For AMBA devices with unconfigured driver override, the "driver_override" sysfs virtual file is empty, while it contains "(null)" for platform and PCI devices. Make AMBA consistent with other buses by dropping the test for a NULL pointer. Note that contrary to popular belief, sprintf() handles NULL pointers fine; they are printed as "(null)". Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Cc: stable <stable@vger.kernel.org> Reviewed-by: Todd Kjos <tkjos@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/amba')
-rw-r--r--drivers/amba/bus.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index f0099360039e..8bf4d39b082b 100644
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -69,9 +69,6 @@ static ssize_t driver_override_show(struct device *_dev,
{
struct amba_device *dev = to_amba_device(_dev);
- if (!dev->driver_override)
- return 0;
-
return sprintf(buf, "%s\n", dev->driver_override);
}