Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a4ca6617421188f50774780cdc91c3782b7d08fe

Authored by Kay Sievers
Committed by Greg Kroah-Hartman
1 parent 1cbfb7a5ac
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

kobject: do not copy vargs, just pass them around 

This prevents a few unneeded copies.

Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Showing 1 changed file with 8 additions and 20 deletions Side-by-side Diff

... ... @@ -216,21 +216,12 @@
216 216 static int kobject_set_name_vargs(struct kobject *kobj, const char *fmt,
217 217 va_list vargs)
218 218 {
219   - va_list aq;
220   - char *name;
221   -
222   - va_copy(aq, vargs);
223   - name = kvasprintf(GFP_KERNEL, fmt, vargs);
224   - va_end(aq);
225   -
226   - if (!name)
227   - return -ENOMEM;
228   -
229 219 /* Free the old name, if necessary. */
230 220 kfree(kobj->name);
231 221  
232   - /* Now, set the new name */
233   - kobj->name = name;
  222 + kobj->name = kvasprintf(GFP_KERNEL, fmt, vargs);
  223 + if (!kobj->name)
  224 + return -ENOMEM;
234 225  
235 226 return 0;
236 227 }
237 228  
... ... @@ -246,12 +237,12 @@
246 237 */
247 238 int kobject_set_name(struct kobject *kobj, const char *fmt, ...)
248 239 {
249   - va_list args;
  240 + va_list vargs;
250 241 int retval;
251 242  
252   - va_start(args, fmt);
253   - retval = kobject_set_name_vargs(kobj, fmt, args);
254   - va_end(args);
  243 + va_start(vargs, fmt);
  244 + retval = kobject_set_name_vargs(kobj, fmt, vargs);
  245 + va_end(vargs);
255 246  
256 247 return retval;
257 248 }
258 249  
... ... @@ -301,12 +292,9 @@
301 292 static int kobject_add_varg(struct kobject *kobj, struct kobject *parent,
302 293 const char *fmt, va_list vargs)
303 294 {
304   - va_list aq;
305 295 int retval;
306 296  
307   - va_copy(aq, vargs);
308   - retval = kobject_set_name_vargs(kobj, fmt, aq);
309   - va_end(aq);
  297 + retval = kobject_set_name_vargs(kobj, fmt, vargs);
310 298 if (retval) {
311 299 printk(KERN_ERR "kobject: can not set name properly!\n");
312 300 return retval;