[PATCH 4.9 44/61] ARM: amba: Make driver_override output consistent with other buses

From: Greg Kroah-Hartman
Date: Mon Apr 30 2018 - 16:17:27 EST

4.9-stable review patch. If anyone has any objections, please let me know.


From: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>

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

Note that contrary to popular belief, sprintf() handles NULL pointers
fine; they are printed as "(null)".

Signed-off-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
Cc: stable <stable@xxxxxxxxxxxxxxx>
Reviewed-by: Todd Kjos <tkjos@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

drivers/amba/bus.c | 3 ---
1 file changed, 3 deletions(-)

--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -70,9 +70,6 @@ static ssize_t driver_override_show(stru
struct amba_device *dev = to_amba_device(_dev);

- if (!dev->driver_override)
- return 0;
return sprintf(buf, "%s\n", dev->driver_override);