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

20 files changed, 27 insertions, 37 deletions

diff --git a/drivers/base/class.c b/drivers/base/class.c
index 6e810881e48b..71059e32bebc 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -406,7 +406,7 @@ EXPORT_SYMBOL_GPL(class_for_each_device);
  *
  * Note, you will need to drop the reference with put_device() after use.
  *
- * @fn is allowed to do anything including calling back into class
+ * @match is allowed to do anything including calling back into class
  * code.  There's no locking restriction.
  */
 struct device *class_find_device(struct class *class, struct device *start,
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 7be2375db7f2..cd813f9110bf 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -2803,8 +2803,7 @@ out_new_dev:
 out_mem2:
         put_disk(disk);
 out_mem:
-        if (pd->rb_pool)
-                mempool_destroy(pd->rb_pool);
+        mempool_destroy(pd->rb_pool);
         kfree(pd);
 out_mutex:
         mutex_unlock(&ctl_mutex);
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
index 0af63da6b603..1f5e956941b1 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -1138,7 +1138,7 @@ out:
         return ret;
 }
 
-/* Create accelerometer ressources */
+/* Create accelerometer resources */
 static int applesmc_create_accelerometer(void)
 {
         struct input_dev *idev;
@@ -1191,7 +1191,7 @@ out:
         return ret;
 }
 
-/* Release all ressources used by the accelerometer */
+/* Release all resources used by the accelerometer */
 static void applesmc_release_accelerometer(void)
 {
         if (!smcreg.has_accelerometer)
diff --git a/drivers/md/bcache/closure.c b/drivers/md/bcache/closure.c
index 7a228de95fd7..9eaf1d6e8302 100644
--- a/drivers/md/bcache/closure.c
+++ b/drivers/md/bcache/closure.c
@@ -167,8 +167,6 @@ EXPORT_SYMBOL(closure_debug_destroy);
 
 static struct dentry *debug;
 
-#define work_data_bits(work) ((unsigned long *)(&(work)->data))
-
 static int debug_seq_show(struct seq_file *f, void *data)
 {
         struct closure *cl;
@@ -182,7 +180,7 @@ static int debug_seq_show(struct seq_file *f, void *data)
                            r & CLOSURE_REMAINING_MASK);
 
                 seq_printf(f, "%s%s%s%s\n",
-                           test_bit(WORK_STRUCT_PENDING,
+                           test_bit(WORK_STRUCT_PENDING_BIT,
                                     work_data_bits(&cl->work)) ? "Q" : "",
                            r & CLOSURE_RUNNING  ? "R" : "",
                            r & CLOSURE_STACK    ? "S" : "",
diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
index 464419b36440..cc8645b5369d 100644
--- a/drivers/misc/c2port/core.c
+++ b/drivers/misc/c2port/core.c
@@ -926,7 +926,7 @@ struct c2port_device *c2port_device_register(char *name,
 
         c2dev->dev = device_create(c2port_class, NULL, 0, c2dev,
                                    "c2port%d", c2dev->id);
-        if (unlikely(IS_ERR(c2dev->dev))) {
+        if (IS_ERR(c2dev->dev)) {
                 ret = PTR_ERR(c2dev->dev);
                 goto error_device_create;
         }
diff --git a/drivers/mtd/ubi/gluebi.c b/drivers/mtd/ubi/gluebi.c
index b93807b4c459..cb7c075f2144 100644
--- a/drivers/mtd/ubi/gluebi.c
+++ b/drivers/mtd/ubi/gluebi.c
@@ -112,8 +112,8 @@ static int gluebi_get_device(struct mtd_info *mtd)
                  * The MTD device is already referenced and this is just one
                  * more reference. MTD allows many users to open the same
                  * volume simultaneously and do not distinguish between
-                 * readers/writers/exclusive openers as UBI does. So we do not
-                 * open the UBI volume again - just increase the reference
+                 * readers/writers/exclusive/meta openers as UBI does. So we do
+                 * not open the UBI volume again - just increase the reference
                  * counter and return.
                  */
                 gluebi->refcnt += 1;
diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c
index 9f9832f0dea9..37b9b39192ec 100644
--- a/drivers/net/ethernet/ti/netcp_core.c
+++ b/drivers/net/ethernet/ti/netcp_core.c
@@ -1036,7 +1036,7 @@ netcp_tx_map_skb(struct sk_buff *skb, struct netcp_intf *netcp)
         }
 
         desc = knav_pool_desc_get(netcp->tx_pool);
-        if (unlikely(IS_ERR_OR_NULL(desc))) {
+        if (IS_ERR_OR_NULL(desc)) {
                 dev_err(netcp->ndev_dev, "out of TX desc\n");
                 dma_unmap_single(dev, dma_addr, pkt_len, DMA_TO_DEVICE);
                 return NULL;
@@ -1069,7 +1069,7 @@ netcp_tx_map_skb(struct sk_buff *skb, struct netcp_intf *netcp)
                 }
 
                 ndesc = knav_pool_desc_get(netcp->tx_pool);
-                if (unlikely(IS_ERR_OR_NULL(ndesc))) {
+                if (IS_ERR_OR_NULL(ndesc)) {
                         dev_err(netcp->ndev_dev, "out of TX desc for frags\n");
                         dma_unmap_page(dev, dma_addr, buf_len, DMA_TO_DEVICE);
                         goto free_descs;
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 95f7a76cfafc..d2f480b04a52 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -242,13 +242,6 @@ config SCSI_SCAN_ASYNC
           system continues booting, and even probe devices on different
           busses in parallel, leading to a significant speed-up.
 
-          If you have built SCSI as modules, enabling this option can
-          be a problem as the devices may not have been found by the
-          time your system expects them to have been.  You can load the
-          scsi_wait_scan module to ensure that all scans have completed.
-          If you build your SCSI drivers into the kernel, then everything
-          will work fine if you say Y here.
-
           You can override this choice by specifying "scsi_mod.scan=sync"
           or async on the kernel's command line.
 
diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c
index b1eede3678a9..0557c45e9c33 100644
--- a/fs/cifs/readdir.c
+++ b/fs/cifs/readdir.c
@@ -84,7 +84,7 @@ cifs_prime_dcache(struct dentry *parent, struct qstr *name,
         cifs_dbg(FYI, "%s: for %s\n", __func__, name->name);
 
         dentry = d_hash_and_lookup(parent, name);
-        if (unlikely(IS_ERR(dentry)))
+        if (IS_ERR(dentry))
                 return;
 
         if (dentry) {
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
index 3c4db1172d22..e2e47ba5d313 100644
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
@@ -270,7 +270,7 @@ ecryptfs_create(struct inode *directory_inode, struct dentry *ecryptfs_dentry,
 
         ecryptfs_inode = ecryptfs_do_create(directory_inode, ecryptfs_dentry,
                                             mode);
-        if (unlikely(IS_ERR(ecryptfs_inode))) {
+        if (IS_ERR(ecryptfs_inode)) {
                 ecryptfs_printk(KERN_WARNING, "Failed to create file in"
                                 "lower filesystem\n");
                 rc = PTR_ERR(ecryptfs_inode);
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 3a6197a2e270..551353b1b17a 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -900,7 +900,7 @@ ext4_find_extent(struct inode *inode, ext4_lblk_t block,
 
                 bh = read_extent_tree_block(inode, path[ppos].p_block, --i,
                                             flags);
-                if (unlikely(IS_ERR(bh))) {
+                if (IS_ERR(bh)) {
                         ret = PTR_ERR(bh);
                         goto err;
                 }
@@ -5796,7 +5796,7 @@ ext4_swap_extents(handle_t *handle, struct inode *inode1,
                 int split = 0;
 
                 path1 = ext4_find_extent(inode1, lblk1, NULL, EXT4_EX_NOCACHE);
-                if (unlikely(IS_ERR(path1))) {
+                if (IS_ERR(path1)) {
                         *erp = PTR_ERR(path1);
                         path1 = NULL;
                 finish:
@@ -5804,7 +5804,7 @@ ext4_swap_extents(handle_t *handle, struct inode *inode1,
                         goto repeat;
                 }
                 path2 = ext4_find_extent(inode2, lblk2, NULL, EXT4_EX_NOCACHE);
-                if (unlikely(IS_ERR(path2))) {
+                if (IS_ERR(path2)) {
                         *erp = PTR_ERR(path2);
                         path2 = NULL;
                         goto finish;
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 19ce34525a59..a969ab39f302 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -1429,7 +1429,7 @@ restart:
                                 }
                                 num++;
                                 bh = ext4_getblk(NULL, dir, b++, 0);
-                                if (unlikely(IS_ERR(bh))) {
+                                if (IS_ERR(bh)) {
                                         if (ra_max == 0) {
                                                 ret = bh;
                                                 goto cleanup_and_exit;
diff --git a/fs/namei.c b/fs/namei.c
index 0d3340b32e14..6f567347f14f 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1966,7 +1966,7 @@ OK:
                 if (err) {
                         const char *s = get_link(nd);
 
-                        if (unlikely(IS_ERR(s)))
+                        if (IS_ERR(s))
                                 return PTR_ERR(s);
                         err = 0;
                         if (unlikely(!s)) {
@@ -3380,7 +3380,7 @@ struct file *do_file_open_root(struct dentry *dentry, struct vfsmount *mnt,
                 return ERR_PTR(-ELOOP);
 
         filename = getname_kernel(name);
-        if (unlikely(IS_ERR(filename)))
+        if (IS_ERR(filename))
                 return ERR_CAST(filename);
 
         set_nameidata(&nd, -1, filename);
diff --git a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c
index 93575e91a7aa..356816e7bc90 100644
--- a/fs/ncpfs/dir.c
+++ b/fs/ncpfs/dir.c
@@ -597,7 +597,7 @@ ncp_fill_cache(struct file *file, struct dir_context *ctx,
         qname.name = __name;
 
         newdent = d_hash_and_lookup(dentry, &qname);
-        if (unlikely(IS_ERR(newdent)))
+        if (IS_ERR(newdent))
                 goto end_advance;
         if (!newdent) {
                 newdent = d_alloc(dentry, &qname);
diff --git a/fs/nfs/objlayout/objio_osd.c b/fs/nfs/objlayout/objio_osd.c
index 5aaed363556a..5c0c6b58157f 100644
--- a/fs/nfs/objlayout/objio_osd.c
+++ b/fs/nfs/objlayout/objio_osd.c
@@ -124,7 +124,7 @@ objio_alloc_deviceid_node(struct nfs_server *server, struct pnfs_device *pdev,
 
 retry_lookup:
         od = osduld_info_lookup(&odi);
-        if (unlikely(IS_ERR(od))) {
+        if (IS_ERR(od)) {
                 err = PTR_ERR(od);
                 dprintk("%s: osduld_info_lookup => %d\n", __func__, err);
                 if (err == -ENODEV && retry_flag) {
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index fdda62e6115e..fe5b6e6c4671 100644
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -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",
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index f5c08b46fef8..00cfd1ae2271 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -151,7 +151,7 @@ static int start_stop_khugepaged(void)
                 if (!khugepaged_thread)
                         khugepaged_thread = kthread_run(khugepaged, NULL,
                                                         "khugepaged");
-                if (unlikely(IS_ERR(khugepaged_thread))) {
+                if (IS_ERR(khugepaged_thread)) {
                         pr_err("khugepaged: kthread_run(khugepaged) failed\n");
                         err = PTR_ERR(khugepaged_thread);
                         khugepaged_thread = NULL;
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index 5633172b791a..91a8b004dc51 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -1175,7 +1175,7 @@ static int ovs_flow_cmd_set(struct sk_buff *skb, struct genl_info *info)
                                                 info, OVS_FLOW_CMD_NEW, false,
                                                 ufid_flags);
 
-                if (unlikely(IS_ERR(reply))) {
+                if (IS_ERR(reply)) {
                         error = PTR_ERR(reply);
                         goto err_unlock_ovs;
                 }
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 17bef01b9aa3..897c01c029ca 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -4475,7 +4475,7 @@ static int sctp_getsockopt_peeloff(struct sock *sk, int len, char __user *optval
         }
 
         newfile = sock_alloc_file(newsock, 0, NULL);
-        if (unlikely(IS_ERR(newfile))) {
+        if (IS_ERR(newfile)) {
                 put_unused_fd(retval);
                 sock_release(newsock);
                 return PTR_ERR(newfile);
diff --git a/net/socket.c b/net/socket.c
index 9963a0b53a64..dd2c247c99e3 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -373,7 +373,7 @@ struct file *sock_alloc_file(struct socket *sock, int flags, const char *dname)
 
         file = alloc_file(&path, FMODE_READ | FMODE_WRITE,
                   &socket_file_ops);
-        if (unlikely(IS_ERR(file))) {
+        if (IS_ERR(file)) {
                 /* drop dentry, keep inode */
                 ihold(d_inode(path.dentry));
                 path_put(&path);
@@ -1303,7 +1303,7 @@ SYSCALL_DEFINE4(socketpair, int, family, int, type, int, protocol,
         }
 
         newfile1 = sock_alloc_file(sock1, flags, NULL);
-        if (unlikely(IS_ERR(newfile1))) {
+        if (IS_ERR(newfile1)) {
                 err = PTR_ERR(newfile1);
                 goto out_put_unused_both;
         }
@@ -1467,7 +1467,7 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
                 goto out_put;
         }
         newfile = sock_alloc_file(newsock, flags, sock->sk->sk_prot_creator->name);
-        if (unlikely(IS_ERR(newfile))) {
+        if (IS_ERR(newfile)) {
                 err = PTR_ERR(newfile);
                 put_unused_fd(newfd);
                 sock_release(newsock);