summaryrefslogtreecommitdiffstats
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-04-26 10:32:51 +0200
commit5f53624662eaac89598641cee6cd54fc192572d9 (patch)
treebeca7380add1710de16b2dc7564ca0f99cded80a /drivers/amba
parentRevert "ARM: amba: Fix race condition with driver_override" (diff)
downloadlinux-5f53624662eaac89598641cee6cd54fc192572d9.tar.xz
linux-5f53624662eaac89598641cee6cd54fc192572d9.zip
ARM: amba: Make driver_override output consistent with other buses
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 fac8e36de11e..f8c01fbef64d 100644
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -70,9 +70,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);
}