[RESEND PATCH 0/3] mux: patches for 4.14

[RESEND PATCH 0/3] mux: patches for 4.14

[Peter Rosin]

Hi Greg!

I sent these individually a couple of weeks ago, and do not
know if you forgot about them or simply haven't gotten to
them yet. I know that by now it's close to the merge window,
but this is trivial stuff. I'm resending as a series, because
I think that might be easier for you?

Cheers,
Peter

Peter Rosin (1):
  mux: zap mux- prefix from the source files

Rob Herring (1):
  mux: convert to using %pOF instead of full_name

Ulrich Hecht (1):
  mux: include compiler.h from mux/consumer.h

 drivers/mux/Makefile                     |  5 +++++
 drivers/mux/{mux-adg792a.c => adg792a.c} |  0
 drivers/mux/{mux-core.c => core.c}       | 12 ++++++------
 drivers/mux/{mux-gpio.c => gpio.c}       |  0
 drivers/mux/{mux-mmio.c => mmio.c}       |  0
 include/linux/mux/consumer.h             |  2 ++
 6 files changed, 13 insertions(+), 6 deletions(-)
 rename drivers/mux/{mux-adg792a.c => adg792a.c} (100%)
 rename drivers/mux/{mux-core.c => core.c} (97%)
 rename drivers/mux/{mux-gpio.c => gpio.c} (100%)
 rename drivers/mux/{mux-mmio.c => mmio.c} (100%)

-- 
2.11.0

[RESEND PATCH 1/3] mux: convert to using %pOF instead of full_name

[Peter Rosin]

From: Rob Herring <robh@kernel.org>

Now that we have a custom printf format specifier, convert users of
full_name to use %pOF instead. This is preparation to remove storing
of the full path string for each node.

Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Peter Rosin <peda@axentia.se>
---
 drivers/mux/mux-core.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/mux/mux-core.c b/drivers/mux/mux-core.c
index 2fe96c470112..aabfb1549d4e 100644
--- a/drivers/mux/mux-core.c
+++ b/drivers/mux/mux-core.c
@@ -452,8 +452,8 @@ struct mux_control *mux_control_get(struct device *dev, const char *mux_name)
 					 "mux-controls", "#mux-control-cells",
 					 index, &args);
 	if (ret) {
-		dev_err(dev, "%s: failed to get mux-control %s(%i)\n",
-			np->full_name, mux_name ?: "", index);
+		dev_err(dev, "%pOF: failed to get mux-control %s(%i)\n",
+			np, mux_name ?: "", index);
 		return ERR_PTR(ret);
 	}
 
@@ -464,8 +464,8 @@ struct mux_control *mux_control_get(struct device *dev, const char *mux_name)
 
 	if (args.args_count > 1 ||
 	    (!args.args_count && (mux_chip->controllers > 1))) {
-		dev_err(dev, "%s: wrong #mux-control-cells for %s\n",
-			np->full_name, args.np->full_name);
+		dev_err(dev, "%pOF: wrong #mux-control-cells for %pOF\n",
+			np, args.np);
 		return ERR_PTR(-EINVAL);
 	}
 
@@ -474,8 +474,8 @@ struct mux_control *mux_control_get(struct device *dev, const char *mux_name)
 		controller = args.args[0];
 
 	if (controller >= mux_chip->controllers) {
-		dev_err(dev, "%s: bad mux controller %u specified in %s\n",
-			np->full_name, controller, args.np->full_name);
+		dev_err(dev, "%pOF: bad mux controller %u specified in %pOF\n",
+			np, controller, args.np);
 		return ERR_PTR(-EINVAL);
 	}
 
-- 
2.11.0

[RESEND PATCH 2/3] mux: include compiler.h from mux/consumer.h

[Peter Rosin]

From: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>

Required for __must_check.

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Signed-off-by: Peter Rosin <peda@axentia.se>
---
 include/linux/mux/consumer.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/linux/mux/consumer.h b/include/linux/mux/consumer.h
index 5577e1b773c4..ea96d4c82be7 100644
--- a/include/linux/mux/consumer.h
+++ b/include/linux/mux/consumer.h
@@ -13,6 +13,8 @@
 #ifndef _LINUX_MUX_CONSUMER_H
 #define _LINUX_MUX_CONSUMER_H
 
+#include <linux/compiler.h>
+
 struct device;
 struct mux_control;
 
-- 
2.11.0

[RESEND PATCH 3/3] mux: zap mux- prefix from the source files

[Peter Rosin]

Preserve the module names with Makefile additions.

Signed-off-by: Peter Rosin <peda@axentia.se>
---
 drivers/mux/Makefile                     | 5 +++++
 drivers/mux/{mux-adg792a.c => adg792a.c} | 0
 drivers/mux/{mux-core.c => core.c}       | 0
 drivers/mux/{mux-gpio.c => gpio.c}       | 0
 drivers/mux/{mux-mmio.c => mmio.c}       | 0
 5 files changed, 5 insertions(+)
 rename drivers/mux/{mux-adg792a.c => adg792a.c} (100%)
 rename drivers/mux/{mux-core.c => core.c} (100%)
 rename drivers/mux/{mux-gpio.c => gpio.c} (100%)
 rename drivers/mux/{mux-mmio.c => mmio.c} (100%)

diff --git a/drivers/mux/Makefile b/drivers/mux/Makefile
index 6bac5b0fea13..0e1e59760e3f 100644
--- a/drivers/mux/Makefile
+++ b/drivers/mux/Makefile
@@ -2,6 +2,11 @@
 # Makefile for multiplexer devices.
 #
 
+mux-core-objs			:= core.o
+mux-adg792a-objs		:= adg792a.o
+mux-gpio-objs			:= gpio.o
+mux-mmio-objs			:= mmio.o
+
 obj-$(CONFIG_MULTIPLEXER)	+= mux-core.o
 obj-$(CONFIG_MUX_ADG792A)	+= mux-adg792a.o
 obj-$(CONFIG_MUX_GPIO)		+= mux-gpio.o
diff --git a/drivers/mux/mux-adg792a.c b/drivers/mux/adg792a.c
similarity index 100%
rename from drivers/mux/mux-adg792a.c
rename to drivers/mux/adg792a.c
diff --git a/drivers/mux/mux-core.c b/drivers/mux/core.c
similarity index 100%
rename from drivers/mux/mux-core.c
rename to drivers/mux/core.c
diff --git a/drivers/mux/mux-gpio.c b/drivers/mux/gpio.c
similarity index 100%
rename from drivers/mux/mux-gpio.c
rename to drivers/mux/gpio.c
diff --git a/drivers/mux/mux-mmio.c b/drivers/mux/mmio.c
similarity index 100%
rename from drivers/mux/mux-mmio.c
rename to drivers/mux/mmio.c
-- 
2.11.0

Re: [RESEND PATCH 0/3] mux: patches for 4.14

[Greg Kroah-Hartman]

On Tue, Aug 22, 2017 at 08:27:05AM +0200, Peter Rosin wrote:
> Hi Greg!
> 
> I sent these individually a couple of weeks ago, and do not
> know if you forgot about them or simply haven't gotten to
> them yet. I know that by now it's close to the merge window,
> but this is trivial stuff. I'm resending as a series, because
> I think that might be easier for you?

Yes, much easier, thanks.  Will go apply these now.

greg k-h