tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'w1-drv-6.19' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1 into char-misc-next

Krzysztof writes:

1-Wire bus drivers for v6.19

Just a bunch of cleanups for few 1-Wire drivers: use sysfs_emit() in
sysfs show, avoid strcpy() and strcat(), and drop unneeded
pm_runtime_mark_last_busy() because core runtime PM handles it.

* tag 'w1-drv-6.19' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1:
w1: omap-hdq: Remove redundant pm_runtime_mark_last_busy() calls
w1: ds28e17: Replace deprecated strcpy + strcat in w1_f19_add_slave
w1: use sysfs_emit() in sysfs show() callbacks

Greg Kroah-Hartman 623db9a1 5abeedad

+12 -17
-5
drivers/w1/masters/omap_hdq.c
··· 445 445 out: 446 446 mutex_unlock(&hdq_data->hdq_mutex); 447 447 rtn: 448 - pm_runtime_mark_last_busy(hdq_data->dev); 449 448 pm_runtime_put_autosuspend(hdq_data->dev); 450 449 451 450 return ret; ··· 465 466 466 467 omap_hdq_break(hdq_data); 467 468 468 - pm_runtime_mark_last_busy(hdq_data->dev); 469 469 pm_runtime_put_autosuspend(hdq_data->dev); 470 470 471 471 return 0; ··· 488 490 if (ret) 489 491 val = -1; 490 492 491 - pm_runtime_mark_last_busy(hdq_data->dev); 492 493 pm_runtime_put_autosuspend(hdq_data->dev); 493 494 494 495 return val; ··· 522 525 } 523 526 524 527 out_err: 525 - pm_runtime_mark_last_busy(hdq_data->dev); 526 528 pm_runtime_put_autosuspend(hdq_data->dev); 527 529 } 528 530 ··· 621 625 622 626 omap_hdq_break(hdq_data); 623 627 624 - pm_runtime_mark_last_busy(&pdev->dev); 625 628 pm_runtime_put_autosuspend(&pdev->dev); 626 629 627 630 omap_w1_master.data = hdq_data;
+2 -2
drivers/w1/slaves/w1_ds28e17.c
··· 719 719 data->adapter.owner = THIS_MODULE; 720 720 data->adapter.algo = &w1_f19_i2c_algorithm; 721 721 data->adapter.algo_data = sl; 722 - strcpy(data->adapter.name, "w1-"); 723 - strcat(data->adapter.name, sl->name); 722 + scnprintf(data->adapter.name, sizeof(data->adapter.name), "w1-%s", 723 + sl->name); 724 724 data->adapter.dev.parent = &sl->dev; 725 725 data->adapter.quirks = &w1_f19_i2c_adapter_quirks; 726 726
+10 -10
drivers/w1/w1.c
··· 86 86 { 87 87 struct w1_slave *sl = dev_to_w1_slave(dev); 88 88 89 - return sprintf(buf, "%s\n", sl->name); 89 + return sysfs_emit(buf, "%s\n", sl->name); 90 90 } 91 91 static DEVICE_ATTR_RO(name); 92 92 ··· 207 207 ssize_t count; 208 208 209 209 mutex_lock(&md->mutex); 210 - count = sprintf(buf, "%s\n", md->name); 210 + count = sysfs_emit(buf, "%s\n", md->name); 211 211 mutex_unlock(&md->mutex); 212 212 213 213 return count; ··· 243 243 ssize_t count; 244 244 245 245 mutex_lock(&md->mutex); 246 - count = sprintf(buf, "%d\n", md->search_count); 246 + count = sysfs_emit(buf, "%d\n", md->search_count); 247 247 mutex_unlock(&md->mutex); 248 248 249 249 return count; ··· 276 276 ssize_t count; 277 277 278 278 mutex_lock(&md->mutex); 279 - count = sprintf(buf, "%d\n", md->enable_pullup); 279 + count = sysfs_emit(buf, "%d\n", md->enable_pullup); 280 280 mutex_unlock(&md->mutex); 281 281 282 282 return count; ··· 288 288 ssize_t count; 289 289 290 290 mutex_lock(&md->mutex); 291 - count = sprintf(buf, "0x%p\n", md->bus_master); 291 + count = sysfs_emit(buf, "0x%p\n", md->bus_master); 292 292 mutex_unlock(&md->mutex); 293 293 return count; 294 294 } 295 295 296 296 static ssize_t w1_master_attribute_show_timeout(struct device *dev, struct device_attribute *attr, char *buf) 297 297 { 298 - return sprintf(buf, "%d\n", w1_timeout); 298 + return sysfs_emit(buf, "%d\n", w1_timeout); 299 299 } 300 300 301 301 static ssize_t w1_master_attribute_show_timeout_us(struct device *dev, 302 302 struct device_attribute *attr, char *buf) 303 303 { 304 - return sprintf(buf, "%d\n", w1_timeout_us); 304 + return sysfs_emit(buf, "%d\n", w1_timeout_us); 305 305 } 306 306 307 307 static ssize_t w1_master_attribute_store_max_slave_count(struct device *dev, ··· 328 328 ssize_t count; 329 329 330 330 mutex_lock(&md->mutex); 331 - count = sprintf(buf, "%d\n", md->max_slave_count); 331 + count = sysfs_emit(buf, "%d\n", md->max_slave_count); 332 332 mutex_unlock(&md->mutex); 333 333 return count; 334 334 } ··· 339 339 ssize_t count; 340 340 341 341 mutex_lock(&md->mutex); 342 - count = sprintf(buf, "%lu\n", md->attempts); 342 + count = sysfs_emit(buf, "%lu\n", md->attempts); 343 343 mutex_unlock(&md->mutex); 344 344 return count; 345 345 } ··· 350 350 ssize_t count; 351 351 352 352 mutex_lock(&md->mutex); 353 - count = sprintf(buf, "%d\n", md->slave_count); 353 + count = sysfs_emit(buf, "%d\n", md->slave_count); 354 354 mutex_unlock(&md->mutex); 355 355 return count; 356 356 }