diff options
Diffstat (limited to 'drivers/mux')
| -rw-r--r-- | drivers/mux/Makefile | 5 | ||||
| -rw-r--r-- | drivers/mux/adg792a.c (renamed from drivers/mux/mux-adg792a.c) | 0 | ||||
| -rw-r--r-- | drivers/mux/core.c (renamed from drivers/mux/mux-core.c) | 14 | ||||
| -rw-r--r-- | drivers/mux/gpio.c (renamed from drivers/mux/mux-gpio.c) | 0 | ||||
| -rw-r--r-- | drivers/mux/mmio.c (renamed from drivers/mux/mux-mmio.c) | 0 |
5 files changed, 12 insertions, 7 deletions
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 index 12aa221ab90d..12aa221ab90d 100644 --- a/drivers/mux/mux-adg792a.c +++ b/drivers/mux/adg792a.c diff --git a/drivers/mux/mux-core.c b/drivers/mux/core.c index 2fe96c470112..2260063b0ea8 100644 --- a/drivers/mux/mux-core.c +++ b/drivers/mux/core.c @@ -58,7 +58,7 @@ static void mux_chip_release(struct device *dev) kfree(mux_chip); } -static struct device_type mux_type = { +static const struct device_type mux_type = { .name = "mux-chip", .release = mux_chip_release, }; @@ -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); } diff --git a/drivers/mux/mux-gpio.c b/drivers/mux/gpio.c index 468bf1709606..468bf1709606 100644 --- a/drivers/mux/mux-gpio.c +++ b/drivers/mux/gpio.c diff --git a/drivers/mux/mux-mmio.c b/drivers/mux/mmio.c index 37c1de359a70..37c1de359a70 100644 --- a/drivers/mux/mux-mmio.c +++ b/drivers/mux/mmio.c |