projects / openwrt / openwrt.git / blob
? search:
summary | shortlog | log | commit | commitdiff | tree
history | raw | HEAD
kernel: bump 5.15 to 5.15.124
[openwrt/openwrt.git] / target / linux / mediatek / patches-5.15 / 850-v6.0-i2c-move-drivers-from-strlcpy-to-strscpy.patch
1 From 2f4ca256a98cc19787b7c861109dd1150a21b0bf Mon Sep 17 00:00:00 2001
2 From: Wolfram Sang <wsa+renesas@sang-engineering.com>
3 Date: Thu, 11 Aug 2022 09:10:30 +0200
4 Subject: [PATCH 11/16] i2c: move drivers from strlcpy to strscpy
5
6 Follow the advice of the below link and prefer 'strscpy'. Conversion is
7 easy because no driver used the return value and has been done with a
8 simple sed invocation.
9
10 Link: https://lore.kernel.org/r/CAHk-=wgfRnXz0W3D37d01q3JFkr_i_uTL=V6A6G1oUZcprmknw@mail.gmail.com/
11 Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
12 Signed-off-by: Wolfram Sang <wsa@kernel.org>
13 ---
14 drivers/i2c/busses/i2c-altera.c | 2 +-
15 drivers/i2c/busses/i2c-aspeed.c | 2 +-
16 drivers/i2c/busses/i2c-au1550.c | 2 +-
17 drivers/i2c/busses/i2c-axxia.c | 2 +-
18 drivers/i2c/busses/i2c-bcm-kona.c | 2 +-
19 drivers/i2c/busses/i2c-cbus-gpio.c | 2 +-
20 drivers/i2c/busses/i2c-cht-wc.c | 2 +-
21 drivers/i2c/busses/i2c-cros-ec-tunnel.c | 2 +-
22 drivers/i2c/busses/i2c-davinci.c | 2 +-
23 drivers/i2c/busses/i2c-digicolor.c | 2 +-
24 drivers/i2c/busses/i2c-eg20t.c | 2 +-
25 drivers/i2c/busses/i2c-emev2.c | 2 +-
26 drivers/i2c/busses/i2c-exynos5.c | 2 +-
27 drivers/i2c/busses/i2c-gpio.c | 2 +-
28 drivers/i2c/busses/i2c-highlander.c | 2 +-
29 drivers/i2c/busses/i2c-hix5hd2.c | 2 +-
30 drivers/i2c/busses/i2c-i801.c | 4 ++--
31 drivers/i2c/busses/i2c-ibm_iic.c | 2 +-
32 drivers/i2c/busses/i2c-icy.c | 2 +-
33 drivers/i2c/busses/i2c-imx-lpi2c.c | 2 +-
34 drivers/i2c/busses/i2c-lpc2k.c | 2 +-
35 drivers/i2c/busses/i2c-meson.c | 2 +-
36 drivers/i2c/busses/i2c-mt65xx.c | 2 +-
37 drivers/i2c/busses/i2c-mt7621.c | 2 +-
38 drivers/i2c/busses/i2c-mv64xxx.c | 2 +-
39 drivers/i2c/busses/i2c-mxs.c | 2 +-
40 drivers/i2c/busses/i2c-nvidia-gpu.c | 2 +-
41 drivers/i2c/busses/i2c-omap.c | 2 +-
42 drivers/i2c/busses/i2c-opal.c | 4 ++--
43 drivers/i2c/busses/i2c-parport.c | 2 +-
44 drivers/i2c/busses/i2c-pxa.c | 2 +-
45 drivers/i2c/busses/i2c-qcom-geni.c | 2 +-
46 drivers/i2c/busses/i2c-qup.c | 2 +-
47 drivers/i2c/busses/i2c-rcar.c | 2 +-
48 drivers/i2c/busses/i2c-riic.c | 2 +-
49 drivers/i2c/busses/i2c-rk3x.c | 2 +-
50 drivers/i2c/busses/i2c-s3c2410.c | 2 +-
51 drivers/i2c/busses/i2c-sh_mobile.c | 2 +-
52 drivers/i2c/busses/i2c-simtec.c | 2 +-
53 drivers/i2c/busses/i2c-taos-evm.c | 2 +-
54 drivers/i2c/busses/i2c-tegra-bpmp.c | 2 +-
55 drivers/i2c/busses/i2c-tegra.c | 2 +-
56 drivers/i2c/busses/i2c-uniphier-f.c | 2 +-
57 drivers/i2c/busses/i2c-uniphier.c | 2 +-
58 drivers/i2c/busses/i2c-versatile.c | 2 +-
59 drivers/i2c/busses/i2c-wmt.c | 2 +-
60 46 files changed, 48 insertions(+), 48 deletions(-)
61
62 --- a/drivers/i2c/busses/i2c-altera.c
63 +++ b/drivers/i2c/busses/i2c-altera.c
64 @@ -447,7 +447,7 @@ static int altr_i2c_probe(struct platfor
65 mutex_unlock(&idev->isr_mutex);
66
67 i2c_set_adapdata(&idev->adapter, idev);
68 - strlcpy(idev->adapter.name, pdev->name, sizeof(idev->adapter.name));
69 + strscpy(idev->adapter.name, pdev->name, sizeof(idev->adapter.name));
70 idev->adapter.owner = THIS_MODULE;
71 idev->adapter.algo = &altr_i2c_algo;
72 idev->adapter.dev.parent = &pdev->dev;
73 --- a/drivers/i2c/busses/i2c-aspeed.c
74 +++ b/drivers/i2c/busses/i2c-aspeed.c
75 @@ -1024,7 +1024,7 @@ static int aspeed_i2c_probe_bus(struct p
76 bus->adap.algo = &aspeed_i2c_algo;
77 bus->adap.dev.parent = &pdev->dev;
78 bus->adap.dev.of_node = pdev->dev.of_node;
79 - strlcpy(bus->adap.name, pdev->name, sizeof(bus->adap.name));
80 + strscpy(bus->adap.name, pdev->name, sizeof(bus->adap.name));
81 i2c_set_adapdata(&bus->adap, bus);
82
83 bus->dev = &pdev->dev;
84 --- a/drivers/i2c/busses/i2c-au1550.c
85 +++ b/drivers/i2c/busses/i2c-au1550.c
86 @@ -321,7 +321,7 @@ i2c_au1550_probe(struct platform_device
87 priv->adap.algo = &au1550_algo;
88 priv->adap.algo_data = priv;
89 priv->adap.dev.parent = &pdev->dev;
90 - strlcpy(priv->adap.name, "Au1xxx PSC I2C", sizeof(priv->adap.name));
91 + strscpy(priv->adap.name, "Au1xxx PSC I2C", sizeof(priv->adap.name));
92
93 /* Now, set up the PSC for SMBus PIO mode. */
94 i2c_au1550_setup(priv);
95 --- a/drivers/i2c/busses/i2c-axxia.c
96 +++ b/drivers/i2c/busses/i2c-axxia.c
97 @@ -783,7 +783,7 @@ static int axxia_i2c_probe(struct platfo
98 }
99
100 i2c_set_adapdata(&idev->adapter, idev);
101 - strlcpy(idev->adapter.name, pdev->name, sizeof(idev->adapter.name));
102 + strscpy(idev->adapter.name, pdev->name, sizeof(idev->adapter.name));
103 idev->adapter.owner = THIS_MODULE;
104 idev->adapter.algo = &axxia_i2c_algo;
105 idev->adapter.bus_recovery_info = &axxia_i2c_recovery_info;
106 --- a/drivers/i2c/busses/i2c-bcm-kona.c
107 +++ b/drivers/i2c/busses/i2c-bcm-kona.c
108 @@ -849,7 +849,7 @@ static int bcm_kona_i2c_probe(struct pla
109 adap = &dev->adapter;
110 i2c_set_adapdata(adap, dev);
111 adap->owner = THIS_MODULE;
112 - strlcpy(adap->name, "Broadcom I2C adapter", sizeof(adap->name));
113 + strscpy(adap->name, "Broadcom I2C adapter", sizeof(adap->name));
114 adap->algo = &bcm_algo;
115 adap->dev.parent = &pdev->dev;
116 adap->dev.of_node = pdev->dev.of_node;
117 --- a/drivers/i2c/busses/i2c-cbus-gpio.c
118 +++ b/drivers/i2c/busses/i2c-cbus-gpio.c
119 @@ -245,7 +245,7 @@ static int cbus_i2c_probe(struct platfor
120 adapter->nr = pdev->id;
121 adapter->timeout = HZ;
122 adapter->algo = &cbus_i2c_algo;
123 - strlcpy(adapter->name, "CBUS I2C adapter", sizeof(adapter->name));
124 + strscpy(adapter->name, "CBUS I2C adapter", sizeof(adapter->name));
125
126 spin_lock_init(&chost->lock);
127 chost->dev = &pdev->dev;
128 --- a/drivers/i2c/busses/i2c-cht-wc.c
129 +++ b/drivers/i2c/busses/i2c-cht-wc.c
130 @@ -334,7 +334,7 @@ static int cht_wc_i2c_adap_i2c_probe(str
131 adap->adapter.class = I2C_CLASS_HWMON;
132 adap->adapter.algo = &cht_wc_i2c_adap_algo;
133 adap->adapter.lock_ops = &cht_wc_i2c_adap_lock_ops;
134 - strlcpy(adap->adapter.name, "PMIC I2C Adapter",
135 + strscpy(adap->adapter.name, "PMIC I2C Adapter",
136 sizeof(adap->adapter.name));
137 adap->adapter.dev.parent = &pdev->dev;
138
139 --- a/drivers/i2c/busses/i2c-cros-ec-tunnel.c
140 +++ b/drivers/i2c/busses/i2c-cros-ec-tunnel.c
141 @@ -267,7 +267,7 @@ static int ec_i2c_probe(struct platform_
142 bus->dev = dev;
143
144 bus->adap.owner = THIS_MODULE;
145 - strlcpy(bus->adap.name, "cros-ec-i2c-tunnel", sizeof(bus->adap.name));
146 + strscpy(bus->adap.name, "cros-ec-i2c-tunnel", sizeof(bus->adap.name));
147 bus->adap.algo = &ec_i2c_algorithm;
148 bus->adap.algo_data = bus;
149 bus->adap.dev.parent = &pdev->dev;
150 --- a/drivers/i2c/busses/i2c-davinci.c
151 +++ b/drivers/i2c/busses/i2c-davinci.c
152 @@ -847,7 +847,7 @@ static int davinci_i2c_probe(struct plat
153 i2c_set_adapdata(adap, dev);
154 adap->owner = THIS_MODULE;
155 adap->class = I2C_CLASS_DEPRECATED;
156 - strlcpy(adap->name, "DaVinci I2C adapter", sizeof(adap->name));
157 + strscpy(adap->name, "DaVinci I2C adapter", sizeof(adap->name));
158 adap->algo = &i2c_davinci_algo;
159 adap->dev.parent = &pdev->dev;
160 adap->timeout = DAVINCI_I2C_TIMEOUT;
161 --- a/drivers/i2c/busses/i2c-digicolor.c
162 +++ b/drivers/i2c/busses/i2c-digicolor.c
163 @@ -322,7 +322,7 @@ static int dc_i2c_probe(struct platform_
164 if (ret < 0)
165 return ret;
166
167 - strlcpy(i2c->adap.name, "Conexant Digicolor I2C adapter",
168 + strscpy(i2c->adap.name, "Conexant Digicolor I2C adapter",
169 sizeof(i2c->adap.name));
170 i2c->adap.owner = THIS_MODULE;
171 i2c->adap.algo = &dc_i2c_algorithm;
172 --- a/drivers/i2c/busses/i2c-eg20t.c
173 +++ b/drivers/i2c/busses/i2c-eg20t.c
174 @@ -773,7 +773,7 @@ static int pch_i2c_probe(struct pci_dev
175
176 pch_adap->owner = THIS_MODULE;
177 pch_adap->class = I2C_CLASS_HWMON;
178 - strlcpy(pch_adap->name, KBUILD_MODNAME, sizeof(pch_adap->name));
179 + strscpy(pch_adap->name, KBUILD_MODNAME, sizeof(pch_adap->name));
180 pch_adap->algo = &pch_algorithm;
181 pch_adap->algo_data = &adap_info->pch_data[i];
182
183 --- a/drivers/i2c/busses/i2c-emev2.c
184 +++ b/drivers/i2c/busses/i2c-emev2.c
185 @@ -371,7 +371,7 @@ static int em_i2c_probe(struct platform_
186 if (IS_ERR(priv->base))
187 return PTR_ERR(priv->base);
188
189 - strlcpy(priv->adap.name, "EMEV2 I2C", sizeof(priv->adap.name));
190 + strscpy(priv->adap.name, "EMEV2 I2C", sizeof(priv->adap.name));
191
192 priv->sclk = devm_clk_get(&pdev->dev, "sclk");
193 if (IS_ERR(priv->sclk))
194 --- a/drivers/i2c/busses/i2c-exynos5.c
195 +++ b/drivers/i2c/busses/i2c-exynos5.c
196 @@ -751,7 +751,7 @@ static int exynos5_i2c_probe(struct plat
197 if (of_property_read_u32(np, "clock-frequency", &i2c->op_clock))
198 i2c->op_clock = I2C_MAX_STANDARD_MODE_FREQ;
199
200 - strlcpy(i2c->adap.name, "exynos5-i2c", sizeof(i2c->adap.name));
201 + strscpy(i2c->adap.name, "exynos5-i2c", sizeof(i2c->adap.name));
202 i2c->adap.owner = THIS_MODULE;
203 i2c->adap.algo = &exynos5_i2c_algorithm;
204 i2c->adap.retries = 3;
205 --- a/drivers/i2c/busses/i2c-gpio.c
206 +++ b/drivers/i2c/busses/i2c-gpio.c
207 @@ -436,7 +436,7 @@ static int i2c_gpio_probe(struct platfor
208
209 adap->owner = THIS_MODULE;
210 if (np)
211 - strlcpy(adap->name, dev_name(dev), sizeof(adap->name));
212 + strscpy(adap->name, dev_name(dev), sizeof(adap->name));
213 else
214 snprintf(adap->name, sizeof(adap->name), "i2c-gpio%d", pdev->id);
215
216 --- a/drivers/i2c/busses/i2c-highlander.c
217 +++ b/drivers/i2c/busses/i2c-highlander.c
218 @@ -402,7 +402,7 @@ static int highlander_i2c_probe(struct p
219 i2c_set_adapdata(adap, dev);
220 adap->owner = THIS_MODULE;
221 adap->class = I2C_CLASS_HWMON;
222 - strlcpy(adap->name, "HL FPGA I2C adapter", sizeof(adap->name));
223 + strscpy(adap->name, "HL FPGA I2C adapter", sizeof(adap->name));
224 adap->algo = &highlander_i2c_algo;
225 adap->dev.parent = &pdev->dev;
226 adap->nr = pdev->id;
227 --- a/drivers/i2c/busses/i2c-hix5hd2.c
228 +++ b/drivers/i2c/busses/i2c-hix5hd2.c
229 @@ -423,7 +423,7 @@ static int hix5hd2_i2c_probe(struct plat
230 }
231 clk_prepare_enable(priv->clk);
232
233 - strlcpy(priv->adap.name, "hix5hd2-i2c", sizeof(priv->adap.name));
234 + strscpy(priv->adap.name, "hix5hd2-i2c", sizeof(priv->adap.name));
235 priv->dev = &pdev->dev;
236 priv->adap.owner = THIS_MODULE;
237 priv->adap.algo = &hix5hd2_i2c_algorithm;
238 --- a/drivers/i2c/busses/i2c-i801.c
239 +++ b/drivers/i2c/busses/i2c-i801.c
240 @@ -1111,7 +1111,7 @@ static void dmi_check_onboard_device(u8
241
242 memset(&info, 0, sizeof(struct i2c_board_info));
243 info.addr = dmi_devices[i].i2c_addr;
244 - strlcpy(info.type, dmi_devices[i].i2c_type, I2C_NAME_SIZE);
245 + strscpy(info.type, dmi_devices[i].i2c_type, I2C_NAME_SIZE);
246 i2c_new_client_device(adap, &info);
247 break;
248 }
249 @@ -1267,7 +1267,7 @@ static void register_dell_lis3lv02d_i2c_
250
251 memset(&info, 0, sizeof(struct i2c_board_info));
252 info.addr = dell_lis3lv02d_devices[i].i2c_addr;
253 - strlcpy(info.type, "lis3lv02d", I2C_NAME_SIZE);
254 + strscpy(info.type, "lis3lv02d", I2C_NAME_SIZE);
255 i2c_new_client_device(&priv->adapter, &info);
256 }
257
258 --- a/drivers/i2c/busses/i2c-ibm_iic.c
259 +++ b/drivers/i2c/busses/i2c-ibm_iic.c
260 @@ -736,7 +736,7 @@ static int iic_probe(struct platform_dev
261 adap = &dev->adap;
262 adap->dev.parent = &ofdev->dev;
263 adap->dev.of_node = of_node_get(np);
264 - strlcpy(adap->name, "IBM IIC", sizeof(adap->name));
265 + strscpy(adap->name, "IBM IIC", sizeof(adap->name));
266 i2c_set_adapdata(adap, dev);
267 adap->class = I2C_CLASS_HWMON | I2C_CLASS_SPD;
268 adap->algo = &iic_algo;
269 --- a/drivers/i2c/busses/i2c-icy.c
270 +++ b/drivers/i2c/busses/i2c-icy.c
271 @@ -141,7 +141,7 @@ static int icy_probe(struct zorro_dev *z
272 i2c->adapter.owner = THIS_MODULE;
273 /* i2c->adapter.algo assigned by i2c_pcf_add_bus() */
274 i2c->adapter.algo_data = algo_data;
275 - strlcpy(i2c->adapter.name, "ICY I2C Zorro adapter",
276 + strscpy(i2c->adapter.name, "ICY I2C Zorro adapter",
277 sizeof(i2c->adapter.name));
278
279 if (!devm_request_mem_region(&z->dev,
280 --- a/drivers/i2c/busses/i2c-imx-lpi2c.c
281 +++ b/drivers/i2c/busses/i2c-imx-lpi2c.c
282 @@ -564,7 +564,7 @@ static int lpi2c_imx_probe(struct platfo
283 lpi2c_imx->adapter.algo = &lpi2c_imx_algo;
284 lpi2c_imx->adapter.dev.parent = &pdev->dev;
285 lpi2c_imx->adapter.dev.of_node = pdev->dev.of_node;
286 - strlcpy(lpi2c_imx->adapter.name, pdev->name,
287 + strscpy(lpi2c_imx->adapter.name, pdev->name,
288 sizeof(lpi2c_imx->adapter.name));
289
290 lpi2c_imx->clk = devm_clk_get(&pdev->dev, NULL);
291 --- a/drivers/i2c/busses/i2c-lpc2k.c
292 +++ b/drivers/i2c/busses/i2c-lpc2k.c
293 @@ -417,7 +417,7 @@ static int i2c_lpc2k_probe(struct platfo
294
295 i2c_set_adapdata(&i2c->adap, i2c);
296 i2c->adap.owner = THIS_MODULE;
297 - strlcpy(i2c->adap.name, "LPC2K I2C adapter", sizeof(i2c->adap.name));
298 + strscpy(i2c->adap.name, "LPC2K I2C adapter", sizeof(i2c->adap.name));
299 i2c->adap.algo = &i2c_lpc2k_algorithm;
300 i2c->adap.dev.parent = &pdev->dev;
301 i2c->adap.dev.of_node = pdev->dev.of_node;
302 --- a/drivers/i2c/busses/i2c-meson.c
303 +++ b/drivers/i2c/busses/i2c-meson.c
304 @@ -451,7 +451,7 @@ static int meson_i2c_probe(struct platfo
305 return ret;
306 }
307
308 - strlcpy(i2c->adap.name, "Meson I2C adapter",
309 + strscpy(i2c->adap.name, "Meson I2C adapter",
310 sizeof(i2c->adap.name));
311 i2c->adap.owner = THIS_MODULE;
312 i2c->adap.algo = &meson_i2c_algorithm;
313 --- a/drivers/i2c/busses/i2c-mt65xx.c
314 +++ b/drivers/i2c/busses/i2c-mt65xx.c
315 @@ -1432,7 +1432,7 @@ static int mtk_i2c_probe(struct platform
316 speed_clk = I2C_MT65XX_CLK_MAIN;
317 }
318
319 - strlcpy(i2c->adap.name, I2C_DRV_NAME, sizeof(i2c->adap.name));
320 + strscpy(i2c->adap.name, I2C_DRV_NAME, sizeof(i2c->adap.name));
321
322 ret = mtk_i2c_set_speed(i2c, clk_get_rate(i2c->clocks[speed_clk].clk));
323 if (ret) {
324 --- a/drivers/i2c/busses/i2c-mt7621.c
325 +++ b/drivers/i2c/busses/i2c-mt7621.c
326 @@ -315,7 +315,7 @@ static int mtk_i2c_probe(struct platform
327 adap->dev.parent = &pdev->dev;
328 i2c_set_adapdata(adap, i2c);
329 adap->dev.of_node = pdev->dev.of_node;
330 - strlcpy(adap->name, dev_name(&pdev->dev), sizeof(adap->name));
331 + strscpy(adap->name, dev_name(&pdev->dev), sizeof(adap->name));
332
333 platform_set_drvdata(pdev, i2c);
334
335 --- a/drivers/i2c/busses/i2c-mv64xxx.c
336 +++ b/drivers/i2c/busses/i2c-mv64xxx.c
337 @@ -1000,7 +1000,7 @@ mv64xxx_i2c_probe(struct platform_device
338 if (IS_ERR(drv_data->reg_base))
339 return PTR_ERR(drv_data->reg_base);
340
341 - strlcpy(drv_data->adapter.name, MV64XXX_I2C_CTLR_NAME " adapter",
342 + strscpy(drv_data->adapter.name, MV64XXX_I2C_CTLR_NAME " adapter",
343 sizeof(drv_data->adapter.name));
344
345 init_waitqueue_head(&drv_data->waitq);
346 --- a/drivers/i2c/busses/i2c-mxs.c
347 +++ b/drivers/i2c/busses/i2c-mxs.c
348 @@ -838,7 +838,7 @@ static int mxs_i2c_probe(struct platform
349 return err;
350
351 adap = &i2c->adapter;
352 - strlcpy(adap->name, "MXS I2C adapter", sizeof(adap->name));
353 + strscpy(adap->name, "MXS I2C adapter", sizeof(adap->name));
354 adap->owner = THIS_MODULE;
355 adap->algo = &mxs_i2c_algo;
356 adap->quirks = &mxs_i2c_quirks;
357 --- a/drivers/i2c/busses/i2c-nvidia-gpu.c
358 +++ b/drivers/i2c/busses/i2c-nvidia-gpu.c
359 @@ -319,7 +319,7 @@ static int gpu_i2c_probe(struct pci_dev
360
361 i2c_set_adapdata(&i2cd->adapter, i2cd);
362 i2cd->adapter.owner = THIS_MODULE;
363 - strlcpy(i2cd->adapter.name, "NVIDIA GPU I2C adapter",
364 + strscpy(i2cd->adapter.name, "NVIDIA GPU I2C adapter",
365 sizeof(i2cd->adapter.name));
366 i2cd->adapter.algo = &gpu_i2c_algorithm;
367 i2cd->adapter.quirks = &gpu_i2c_quirks;
368 --- a/drivers/i2c/busses/i2c-omap.c
369 +++ b/drivers/i2c/busses/i2c-omap.c
370 @@ -1488,7 +1488,7 @@ omap_i2c_probe(struct platform_device *p
371 i2c_set_adapdata(adap, omap);
372 adap->owner = THIS_MODULE;
373 adap->class = I2C_CLASS_DEPRECATED;
374 - strlcpy(adap->name, "OMAP I2C adapter", sizeof(adap->name));
375 + strscpy(adap->name, "OMAP I2C adapter", sizeof(adap->name));
376 adap->algo = &omap_i2c_algo;
377 adap->quirks = &omap_i2c_quirks;
378 adap->dev.parent = &pdev->dev;
379 --- a/drivers/i2c/busses/i2c-opal.c
380 +++ b/drivers/i2c/busses/i2c-opal.c
381 @@ -220,9 +220,9 @@ static int i2c_opal_probe(struct platfor
382 adapter->dev.of_node = of_node_get(pdev->dev.of_node);
383 pname = of_get_property(pdev->dev.of_node, "ibm,port-name", NULL);
384 if (pname)
385 - strlcpy(adapter->name, pname, sizeof(adapter->name));
386 + strscpy(adapter->name, pname, sizeof(adapter->name));
387 else
388 - strlcpy(adapter->name, "opal", sizeof(adapter->name));
389 + strscpy(adapter->name, "opal", sizeof(adapter->name));
390
391 platform_set_drvdata(pdev, adapter);
392 rc = i2c_add_adapter(adapter);
393 --- a/drivers/i2c/busses/i2c-parport.c
394 +++ b/drivers/i2c/busses/i2c-parport.c
395 @@ -308,7 +308,7 @@ static void i2c_parport_attach(struct pa
396 /* Fill the rest of the structure */
397 adapter->adapter.owner = THIS_MODULE;
398 adapter->adapter.class = I2C_CLASS_HWMON;
399 - strlcpy(adapter->adapter.name, "Parallel port adapter",
400 + strscpy(adapter->adapter.name, "Parallel port adapter",
401 sizeof(adapter->adapter.name));
402 adapter->algo_data = parport_algo_data;
403 /* Slow down if we can't sense SCL */
404 --- a/drivers/i2c/busses/i2c-pxa.c
405 +++ b/drivers/i2c/busses/i2c-pxa.c
406 @@ -1403,7 +1403,7 @@ static int i2c_pxa_probe(struct platform
407 spin_lock_init(&i2c->lock);
408 init_waitqueue_head(&i2c->wait);
409
410 - strlcpy(i2c->adap.name, "pxa_i2c-i2c", sizeof(i2c->adap.name));
411 + strscpy(i2c->adap.name, "pxa_i2c-i2c", sizeof(i2c->adap.name));
412
413 i2c->clk = devm_clk_get(&dev->dev, NULL);
414 if (IS_ERR(i2c->clk)) {
415 --- a/drivers/i2c/busses/i2c-qcom-geni.c
416 +++ b/drivers/i2c/busses/i2c-qcom-geni.c
417 @@ -577,7 +577,7 @@ static int geni_i2c_probe(struct platfor
418 i2c_set_adapdata(&gi2c->adap, gi2c);
419 gi2c->adap.dev.parent = dev;
420 gi2c->adap.dev.of_node = dev->of_node;
421 - strlcpy(gi2c->adap.name, "Geni-I2C", sizeof(gi2c->adap.name));
422 + strscpy(gi2c->adap.name, "Geni-I2C", sizeof(gi2c->adap.name));
423
424 ret = geni_icc_get(&gi2c->se, "qup-memory");
425 if (ret)
426 --- a/drivers/i2c/busses/i2c-qup.c
427 +++ b/drivers/i2c/busses/i2c-qup.c
428 @@ -1885,7 +1885,7 @@ nodma:
429 qup->adap.dev.of_node = pdev->dev.of_node;
430 qup->is_last = true;
431
432 - strlcpy(qup->adap.name, "QUP I2C adapter", sizeof(qup->adap.name));
433 + strscpy(qup->adap.name, "QUP I2C adapter", sizeof(qup->adap.name));
434
435 pm_runtime_set_autosuspend_delay(qup->dev, MSEC_PER_SEC);
436 pm_runtime_use_autosuspend(qup->dev);
437 --- a/drivers/i2c/busses/i2c-rcar.c
438 +++ b/drivers/i2c/busses/i2c-rcar.c
439 @@ -1059,7 +1059,7 @@ static int rcar_i2c_probe(struct platfor
440 adap->bus_recovery_info = &rcar_i2c_bri;
441 adap->quirks = &rcar_i2c_quirks;
442 i2c_set_adapdata(adap, priv);
443 - strlcpy(adap->name, pdev->name, sizeof(adap->name));
444 + strscpy(adap->name, pdev->name, sizeof(adap->name));
445
446 /* Init DMA */
447 sg_init_table(&priv->sg, 1);
448 --- a/drivers/i2c/busses/i2c-riic.c
449 +++ b/drivers/i2c/busses/i2c-riic.c
450 @@ -447,7 +447,7 @@ static int riic_i2c_probe(struct platfor
451
452 adap = &riic->adapter;
453 i2c_set_adapdata(adap, riic);
454 - strlcpy(adap->name, "Renesas RIIC adapter", sizeof(adap->name));
455 + strscpy(adap->name, "Renesas RIIC adapter", sizeof(adap->name));
456 adap->owner = THIS_MODULE;
457 adap->algo = &riic_algo;
458 adap->dev.parent = &pdev->dev;
459 --- a/drivers/i2c/busses/i2c-rk3x.c
460 +++ b/drivers/i2c/busses/i2c-rk3x.c
461 @@ -1240,7 +1240,7 @@ static int rk3x_i2c_probe(struct platfor
462 /* use common interface to get I2C timing properties */
463 i2c_parse_fw_timings(&pdev->dev, &i2c->t, true);
464
465 - strlcpy(i2c->adap.name, "rk3x-i2c", sizeof(i2c->adap.name));
466 + strscpy(i2c->adap.name, "rk3x-i2c", sizeof(i2c->adap.name));
467 i2c->adap.owner = THIS_MODULE;
468 i2c->adap.algo = &rk3x_i2c_algorithm;
469 i2c->adap.retries = 3;
470 --- a/drivers/i2c/busses/i2c-s3c2410.c
471 +++ b/drivers/i2c/busses/i2c-s3c2410.c
472 @@ -1076,7 +1076,7 @@ static int s3c24xx_i2c_probe(struct plat
473 else
474 s3c24xx_i2c_parse_dt(pdev->dev.of_node, i2c);
475
476 - strlcpy(i2c->adap.name, "s3c2410-i2c", sizeof(i2c->adap.name));
477 + strscpy(i2c->adap.name, "s3c2410-i2c", sizeof(i2c->adap.name));
478 i2c->adap.owner = THIS_MODULE;
479 i2c->adap.algo = &s3c24xx_i2c_algorithm;
480 i2c->adap.retries = 2;
481 --- a/drivers/i2c/busses/i2c-sh_mobile.c
482 +++ b/drivers/i2c/busses/i2c-sh_mobile.c
483 @@ -930,7 +930,7 @@ static int sh_mobile_i2c_probe(struct pl
484 adap->nr = dev->id;
485 adap->dev.of_node = dev->dev.of_node;
486
487 - strlcpy(adap->name, dev->name, sizeof(adap->name));
488 + strscpy(adap->name, dev->name, sizeof(adap->name));
489
490 spin_lock_init(&pd->lock);
491 init_waitqueue_head(&pd->wait);
492 --- a/drivers/i2c/busses/i2c-simtec.c
493 +++ b/drivers/i2c/busses/i2c-simtec.c
494 @@ -99,7 +99,7 @@ static int simtec_i2c_probe(struct platf
495 pd->adap.algo_data = &pd->bit;
496 pd->adap.dev.parent = &dev->dev;
497
498 - strlcpy(pd->adap.name, "Simtec I2C", sizeof(pd->adap.name));
499 + strscpy(pd->adap.name, "Simtec I2C", sizeof(pd->adap.name));
500
501 pd->bit.data = pd;
502 pd->bit.setsda = simtec_i2c_setsda;
503 --- a/drivers/i2c/busses/i2c-taos-evm.c
504 +++ b/drivers/i2c/busses/i2c-taos-evm.c
505 @@ -239,7 +239,7 @@ static int taos_connect(struct serio *se
506 dev_err(&serio->dev, "TAOS EVM identification failed\n");
507 goto exit_close;
508 }
509 - strlcpy(adapter->name, name, sizeof(adapter->name));
510 + strscpy(adapter->name, name, sizeof(adapter->name));
511
512 /* Turn echo off for better performance */
513 taos->state = TAOS_STATE_EOFF;
514 --- a/drivers/i2c/busses/i2c-tegra-bpmp.c
515 +++ b/drivers/i2c/busses/i2c-tegra-bpmp.c
516 @@ -305,7 +305,7 @@ static int tegra_bpmp_i2c_probe(struct p
517
518 i2c_set_adapdata(&i2c->adapter, i2c);
519 i2c->adapter.owner = THIS_MODULE;
520 - strlcpy(i2c->adapter.name, "Tegra BPMP I2C adapter",
521 + strscpy(i2c->adapter.name, "Tegra BPMP I2C adapter",
522 sizeof(i2c->adapter.name));
523 i2c->adapter.algo = &tegra_bpmp_i2c_algo;
524 i2c->adapter.dev.parent = &pdev->dev;
525 --- a/drivers/i2c/busses/i2c-tegra.c
526 +++ b/drivers/i2c/busses/i2c-tegra.c
527 @@ -1799,7 +1799,7 @@ static int tegra_i2c_probe(struct platfo
528 if (i2c_dev->hw->supports_bus_clear)
529 i2c_dev->adapter.bus_recovery_info = &tegra_i2c_recovery_info;
530
531 - strlcpy(i2c_dev->adapter.name, dev_name(i2c_dev->dev),
532 + strscpy(i2c_dev->adapter.name, dev_name(i2c_dev->dev),
533 sizeof(i2c_dev->adapter.name));
534
535 err = i2c_add_numbered_adapter(&i2c_dev->adapter);
536 --- a/drivers/i2c/busses/i2c-uniphier-f.c
537 +++ b/drivers/i2c/busses/i2c-uniphier-f.c
538 @@ -564,7 +564,7 @@ static int uniphier_fi2c_probe(struct pl
539 priv->adap.algo = &uniphier_fi2c_algo;
540 priv->adap.dev.parent = dev;
541 priv->adap.dev.of_node = dev->of_node;
542 - strlcpy(priv->adap.name, "UniPhier FI2C", sizeof(priv->adap.name));
543 + strscpy(priv->adap.name, "UniPhier FI2C", sizeof(priv->adap.name));
544 priv->adap.bus_recovery_info = &uniphier_fi2c_bus_recovery_info;
545 i2c_set_adapdata(&priv->adap, priv);
546 platform_set_drvdata(pdev, priv);
547 --- a/drivers/i2c/busses/i2c-uniphier.c
548 +++ b/drivers/i2c/busses/i2c-uniphier.c
549 @@ -358,7 +358,7 @@ static int uniphier_i2c_probe(struct pla
550 priv->adap.algo = &uniphier_i2c_algo;
551 priv->adap.dev.parent = dev;
552 priv->adap.dev.of_node = dev->of_node;
553 - strlcpy(priv->adap.name, "UniPhier I2C", sizeof(priv->adap.name));
554 + strscpy(priv->adap.name, "UniPhier I2C", sizeof(priv->adap.name));
555 priv->adap.bus_recovery_info = &uniphier_i2c_bus_recovery_info;
556 i2c_set_adapdata(&priv->adap, priv);
557 platform_set_drvdata(pdev, priv);
558 --- a/drivers/i2c/busses/i2c-versatile.c
559 +++ b/drivers/i2c/busses/i2c-versatile.c
560 @@ -79,7 +79,7 @@ static int i2c_versatile_probe(struct pl
561 writel(SCL | SDA, i2c->base + I2C_CONTROLS);
562
563 i2c->adap.owner = THIS_MODULE;
564 - strlcpy(i2c->adap.name, "Versatile I2C adapter", sizeof(i2c->adap.name));
565 + strscpy(i2c->adap.name, "Versatile I2C adapter", sizeof(i2c->adap.name));
566 i2c->adap.algo_data = &i2c->algo;
567 i2c->adap.dev.parent = &dev->dev;
568 i2c->adap.dev.of_node = dev->dev.of_node;
569 --- a/drivers/i2c/busses/i2c-wmt.c
570 +++ b/drivers/i2c/busses/i2c-wmt.c
571 @@ -413,7 +413,7 @@ static int wmt_i2c_probe(struct platform
572
573 adap = &i2c_dev->adapter;
574 i2c_set_adapdata(adap, i2c_dev);
575 - strlcpy(adap->name, "WMT I2C adapter", sizeof(adap->name));
576 + strscpy(adap->name, "WMT I2C adapter", sizeof(adap->name));
577 adap->owner = THIS_MODULE;
578 adap->algo = &wmt_i2c_algo;
579 adap->dev.parent = &pdev->dev;
OpenWrt Source Repository