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

3 files changed, 5 insertions, 5 deletions

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);