diff options
author | Rob Herring <robh@kernel.org> | 2018-08-27 21:52:41 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2018-08-29 08:05:36 -0400 |
commit | 94f4e54cecaf3ec9181cca9367e1ad0d60188d1f (patch) | |
tree | 626cd60a2c9f56ef13872ae6f8bc34ed44291dfc /drivers/pinctrl/pinctrl-single.c | |
parent | 803ceb297a240e7356907b84a8b334400bbf4f4c (diff) |
pinctrl: Convert to using %pOFn instead of device_node.name
In preparation to remove the node name pointer from struct device_node,
convert printf users to use the %pOFn format specifier.
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Dong Aisheng <aisheng.dong@nxp.com>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Stefan Agner <stefan@agner.ch>
Cc: Pengutronix Kernel Team <kernel@pengutronix.de>
Cc: Sean Wang <sean.wang@mediatek.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Carlo Caione <carlo@caione.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Gregory Clement <gregory.clement@bootlin.com>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: Nicolas Ferre <nicolas.ferre@microchip.com>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Haojian Zhuang <haojian.zhuang@linaro.org>
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: Barry Song <baohua@kernel.org>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Maxime Ripard <maxime.ripard@bootlin.com>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: linux-gpio@vger.kernel.org
Cc: linux-mediatek@lists.infradead.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-amlogic@lists.infradead.org
Cc: linux-rockchip@lists.infradead.org
Cc: linux-omap@vger.kernel.org
Acked-by: Dong Aisheng <aisheng.dong@nxp.com>
Reviewed-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Sean Wang <sean.wang@mediatek.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
Acked-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/pinctrl-single.c')
-rw-r--r-- | drivers/pinctrl/pinctrl-single.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c index 7ec72ff2419a..1e0614daee9b 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c | |||
@@ -1022,14 +1022,14 @@ static int pcs_parse_one_pinctrl_entry(struct pcs_device *pcs, | |||
1022 | vals[found].reg = pcs->base + offset; | 1022 | vals[found].reg = pcs->base + offset; |
1023 | vals[found].val = pinctrl_spec.args[1]; | 1023 | vals[found].val = pinctrl_spec.args[1]; |
1024 | 1024 | ||
1025 | dev_dbg(pcs->dev, "%s index: 0x%x value: 0x%x\n", | 1025 | dev_dbg(pcs->dev, "%pOFn index: 0x%x value: 0x%x\n", |
1026 | pinctrl_spec.np->name, offset, pinctrl_spec.args[1]); | 1026 | pinctrl_spec.np, offset, pinctrl_spec.args[1]); |
1027 | 1027 | ||
1028 | pin = pcs_get_pin_by_offset(pcs, offset); | 1028 | pin = pcs_get_pin_by_offset(pcs, offset); |
1029 | if (pin < 0) { | 1029 | if (pin < 0) { |
1030 | dev_err(pcs->dev, | 1030 | dev_err(pcs->dev, |
1031 | "could not add functions for %s %ux\n", | 1031 | "could not add functions for %pOFn %ux\n", |
1032 | np->name, offset); | 1032 | np, offset); |
1033 | break; | 1033 | break; |
1034 | } | 1034 | } |
1035 | pins[found++] = pin; | 1035 | pins[found++] = pin; |
@@ -1135,8 +1135,8 @@ static int pcs_parse_bits_in_pinctrl_entry(struct pcs_device *pcs, | |||
1135 | val = pinctrl_spec.args[1]; | 1135 | val = pinctrl_spec.args[1]; |
1136 | mask = pinctrl_spec.args[2]; | 1136 | mask = pinctrl_spec.args[2]; |
1137 | 1137 | ||
1138 | dev_dbg(pcs->dev, "%s index: 0x%x value: 0x%x mask: 0x%x\n", | 1138 | dev_dbg(pcs->dev, "%pOFn index: 0x%x value: 0x%x mask: 0x%x\n", |
1139 | pinctrl_spec.np->name, offset, val, mask); | 1139 | pinctrl_spec.np, offset, val, mask); |
1140 | 1140 | ||
1141 | /* Parse pins in each row from LSB */ | 1141 | /* Parse pins in each row from LSB */ |
1142 | while (mask) { | 1142 | while (mask) { |
@@ -1148,8 +1148,8 @@ static int pcs_parse_bits_in_pinctrl_entry(struct pcs_device *pcs, | |||
1148 | 1148 | ||
1149 | if ((mask & mask_pos) == 0) { | 1149 | if ((mask & mask_pos) == 0) { |
1150 | dev_err(pcs->dev, | 1150 | dev_err(pcs->dev, |
1151 | "Invalid mask for %s at 0x%x\n", | 1151 | "Invalid mask for %pOFn at 0x%x\n", |
1152 | np->name, offset); | 1152 | np, offset); |
1153 | break; | 1153 | break; |
1154 | } | 1154 | } |
1155 | 1155 | ||
@@ -1157,8 +1157,8 @@ static int pcs_parse_bits_in_pinctrl_entry(struct pcs_device *pcs, | |||
1157 | 1157 | ||
1158 | if (submask != mask_pos) { | 1158 | if (submask != mask_pos) { |
1159 | dev_warn(pcs->dev, | 1159 | dev_warn(pcs->dev, |
1160 | "Invalid submask 0x%x for %s at 0x%x\n", | 1160 | "Invalid submask 0x%x for %pOFn at 0x%x\n", |
1161 | submask, np->name, offset); | 1161 | submask, np, offset); |
1162 | continue; | 1162 | continue; |
1163 | } | 1163 | } |
1164 | 1164 | ||
@@ -1169,8 +1169,8 @@ static int pcs_parse_bits_in_pinctrl_entry(struct pcs_device *pcs, | |||
1169 | pin = pcs_get_pin_by_offset(pcs, offset); | 1169 | pin = pcs_get_pin_by_offset(pcs, offset); |
1170 | if (pin < 0) { | 1170 | if (pin < 0) { |
1171 | dev_err(pcs->dev, | 1171 | dev_err(pcs->dev, |
1172 | "could not add functions for %s %ux\n", | 1172 | "could not add functions for %pOFn %ux\n", |
1173 | np->name, offset); | 1173 | np, offset); |
1174 | break; | 1174 | break; |
1175 | } | 1175 | } |
1176 | pins[found++] = pin + pin_num_from_lsb; | 1176 | pins[found++] = pin + pin_num_from_lsb; |
@@ -1254,16 +1254,16 @@ static int pcs_dt_node_to_map(struct pinctrl_dev *pctldev, | |||
1254 | ret = pcs_parse_bits_in_pinctrl_entry(pcs, np_config, map, | 1254 | ret = pcs_parse_bits_in_pinctrl_entry(pcs, np_config, map, |
1255 | num_maps, pgnames); | 1255 | num_maps, pgnames); |
1256 | if (ret < 0) { | 1256 | if (ret < 0) { |
1257 | dev_err(pcs->dev, "no pins entries for %s\n", | 1257 | dev_err(pcs->dev, "no pins entries for %pOFn\n", |
1258 | np_config->name); | 1258 | np_config); |
1259 | goto free_pgnames; | 1259 | goto free_pgnames; |
1260 | } | 1260 | } |
1261 | } else { | 1261 | } else { |
1262 | ret = pcs_parse_one_pinctrl_entry(pcs, np_config, map, | 1262 | ret = pcs_parse_one_pinctrl_entry(pcs, np_config, map, |
1263 | num_maps, pgnames); | 1263 | num_maps, pgnames); |
1264 | if (ret < 0) { | 1264 | if (ret < 0) { |
1265 | dev_err(pcs->dev, "no pins entries for %s\n", | 1265 | dev_err(pcs->dev, "no pins entries for %pOFn\n", |
1266 | np_config->name); | 1266 | np_config); |
1267 | goto free_pgnames; | 1267 | goto free_pgnames; |
1268 | } | 1268 | } |
1269 | } | 1269 | } |