| Message ID | 20180828015252.28511-23-robh@kernel.org |
|---|---|
| State | Accepted |
| Commit | b297b728138bbd8a844513bc226ec995c553bdb2 |
| Headers | show |
| Series | input: sun4i-lradc: Convert to using %pOFn instead of device_node.name | expand |
On Mon, Aug 27, 2018 at 8:54 PM Rob Herring <robh@kernel.org> wrote: > > In preparation to remove the node name pointer from struct device_node, > convert printf users to use the %pOFn format specifier. > > Cc: Hans de Goede <hdegoede@redhat.com> > Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> > Cc: Maxime Ripard <maxime.ripard@bootlin.com> > Cc: linux-input@vger.kernel.org > Signed-off-by: Rob Herring <robh@kernel.org> > --- > drivers/input/keyboard/sun4i-lradc-keys.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Ping. > > diff --git a/drivers/input/keyboard/sun4i-lradc-keys.c b/drivers/input/keyboard/sun4i-lradc-keys.c > index a37c172452e6..57272df34cd5 100644 > --- a/drivers/input/keyboard/sun4i-lradc-keys.c > +++ b/drivers/input/keyboard/sun4i-lradc-keys.c > @@ -185,19 +185,19 @@ static int sun4i_lradc_load_dt_keymap(struct device *dev, > > error = of_property_read_u32(pp, "channel", &channel); > if (error || channel != 0) { > - dev_err(dev, "%s: Inval channel prop\n", pp->name); > + dev_err(dev, "%pOFn: Inval channel prop\n", pp); > return -EINVAL; > } > > error = of_property_read_u32(pp, "voltage", &map->voltage); > if (error) { > - dev_err(dev, "%s: Inval voltage prop\n", pp->name); > + dev_err(dev, "%pOFn: Inval voltage prop\n", pp); > return -EINVAL; > } > > error = of_property_read_u32(pp, "linux,code", &map->keycode); > if (error) { > - dev_err(dev, "%s: Inval linux,code prop\n", pp->name); > + dev_err(dev, "%pOFn: Inval linux,code prop\n", pp); > return -EINVAL; > } > > -- > 2.17.1 >
diff --git a/drivers/input/keyboard/sun4i-lradc-keys.c b/drivers/input/keyboard/sun4i-lradc-keys.c index a37c172452e6..57272df34cd5 100644 --- a/drivers/input/keyboard/sun4i-lradc-keys.c +++ b/drivers/input/keyboard/sun4i-lradc-keys.c @@ -185,19 +185,19 @@ static int sun4i_lradc_load_dt_keymap(struct device *dev, error = of_property_read_u32(pp, "channel", &channel); if (error || channel != 0) { - dev_err(dev, "%s: Inval channel prop\n", pp->name); + dev_err(dev, "%pOFn: Inval channel prop\n", pp); return -EINVAL; } error = of_property_read_u32(pp, "voltage", &map->voltage); if (error) { - dev_err(dev, "%s: Inval voltage prop\n", pp->name); + dev_err(dev, "%pOFn: Inval voltage prop\n", pp); return -EINVAL; } error = of_property_read_u32(pp, "linux,code", &map->keycode); if (error) { - dev_err(dev, "%s: Inval linux,code prop\n", pp->name); + dev_err(dev, "%pOFn: Inval linux,code prop\n", pp); return -EINVAL; }
In preparation to remove the node name pointer from struct device_node, convert printf users to use the %pOFn format specifier. Cc: Hans de Goede <hdegoede@redhat.com> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> Cc: Maxime Ripard <maxime.ripard@bootlin.com> Cc: linux-input@vger.kernel.org Signed-off-by: Rob Herring <robh@kernel.org> --- drivers/input/keyboard/sun4i-lradc-keys.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.17.1