mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial updates from Jiri Kosina:
"Trivial stuff from trivial tree that can be trivially summed up as:
- treewide drop of spurious unlikely() before IS_ERR() from Viresh
Kumar
- cosmetic fixes (that don't really affect basic functionality of the
driver) for pktcdvd and bcache, from Julia Lawall and Petr Mladek
- various comment / printk fixes and updates all over the place"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
bcache: Really show state of work pending bit
hwmon: applesmc: fix comment typos
Kconfig: remove comment about scsi_wait_scan module
class_find_device: fix reference to argument "match"
debugfs: document that debugfs_remove*() accepts NULL and error values
net: Drop unlikely before IS_ERR(_OR_NULL)
mm: Drop unlikely before IS_ERR(_OR_NULL)
fs: Drop unlikely before IS_ERR(_OR_NULL)
drivers: net: Drop unlikely before IS_ERR(_OR_NULL)
drivers: misc: Drop unlikely before IS_ERR(_OR_NULL)
UBI: Update comments to reflect UBI_METAONLY flag
pktcdvd: drop null test before destroy functions
This commit is contained in:
commit
75021d2859
20 changed files with 27 additions and 37 deletions
|
|
@ -948,7 +948,7 @@ static struct ctl_dir *get_subdir(struct ctl_dir *dir,
|
|||
found:
|
||||
subdir->header.nreg++;
|
||||
failed:
|
||||
if (unlikely(IS_ERR(subdir))) {
|
||||
if (IS_ERR(subdir)) {
|
||||
pr_err("sysctl could not get directory: ");
|
||||
sysctl_print_dir(dir);
|
||||
pr_cont("/%*.*s %ld\n",
|
||||
|
|
|
|||
Loading…
Reference in a new issue