IS_ERR() already implies unlikely(), so it can be omitted here.
Signed-off-by: Tobias Klauser <[email protected]>
---
drivers/misc/c2port/core.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
index 19fc7c1..95a82de 100644
--- a/drivers/misc/c2port/core.c
+++ b/drivers/misc/c2port/core.c
@@ -913,7 +913,7 @@ struct c2port_device *c2port_device_register(char *name,
c2dev->dev = device_create(c2port_class, NULL, 0, c2dev,
"c2port%d", id);
- if (unlikely(IS_ERR(c2dev->dev))) {
+ if (IS_ERR(c2dev->dev)) {
ret = PTR_ERR(c2dev->dev);
goto error_device_create;
}
--
1.7.0.4
IS_ERR() already implies unlikely(), so it can be omitted here.
Signed-off-by: Tobias Klauser <[email protected]>
---
drivers/misc/c2port/core.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
index 19fc7c1..95a82de 100644
--- a/drivers/misc/c2port/core.c
+++ b/drivers/misc/c2port/core.c
@@ -913,7 +913,7 @@ struct c2port_device *c2port_device_register(char *name,
c2dev->dev = device_create(c2port_class, NULL, 0, c2dev,
"c2port%d", id);
- if (unlikely(IS_ERR(c2dev->dev))) {
+ if (IS_ERR(c2dev->dev)) {
ret = PTR_ERR(c2dev->dev);
goto error_device_create;
}
--
1.7.0.4
IS_ERR already uses unlikely, remove unlikely from the call sites.
Signed-off-by: Joe Perches <[email protected]>
---
drivers/serial/msm_serial.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/serial/msm_serial.c b/drivers/serial/msm_serial.c
index f8c816e..8e43a7b 100644
--- a/drivers/serial/msm_serial.c
+++ b/drivers/serial/msm_serial.c
@@ -686,7 +686,7 @@ static int __init msm_serial_probe(struct platform_device *pdev)
msm_port = UART_TO_MSM(port);
msm_port->clk = clk_get(&pdev->dev, "uart_clk");
- if (unlikely(IS_ERR(msm_port->clk)))
+ if (IS_ERR(msm_port->clk))
return PTR_ERR(msm_port->clk);
port->uartclk = clk_get_rate(msm_port->clk);
printk(KERN_INFO "uartclk = %d\n", port->uartclk);
--
1.7.3.3.464.gf80b6
IS_ERR already uses unlikely, remove unlikely from the call sites.
Signed-off-by: Joe Perches <[email protected]>
---
drivers/scsi/osd/osd_initiator.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/scsi/osd/osd_initiator.c b/drivers/scsi/osd/osd_initiator.c
index b798919..b37c8a3 100644
--- a/drivers/scsi/osd/osd_initiator.c
+++ b/drivers/scsi/osd/osd_initiator.c
@@ -951,7 +951,7 @@ static int _osd_req_finalize_cdb_cont(struct osd_request *or, const u8 *cap_key)
/* create a bio for continuation segment */
bio = bio_map_kern(req_q, or->cdb_cont.buff, or->cdb_cont.total_bytes,
GFP_KERNEL);
- if (unlikely(IS_ERR(bio)))
+ if (IS_ERR(bio))
return PTR_ERR(bio);
bio->bi_rw |= REQ_WRITE;
--
1.7.3.3.464.gf80b6
IS_ERR already uses unlikely, remove unlikely from the call sites.
Signed-off-by: Joe Perches <[email protected]>
---
drivers/rtc/rtc-bfin.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/rtc/rtc-bfin.c b/drivers/rtc/rtc-bfin.c
index b4b6087..4ba3e33 100644
--- a/drivers/rtc/rtc-bfin.c
+++ b/drivers/rtc/rtc-bfin.c
@@ -383,7 +383,7 @@ static int __devinit bfin_rtc_probe(struct platform_device *pdev)
/* Register our RTC with the RTC framework */
rtc->rtc_dev = rtc_device_register(pdev->name, dev, &bfin_rtc_ops,
THIS_MODULE);
- if (unlikely(IS_ERR(rtc->rtc_dev))) {
+ if (IS_ERR(rtc->rtc_dev)) {
ret = PTR_ERR(rtc->rtc_dev);
goto err;
}
--
1.7.3.3.464.gf80b6
IS_ERR already uses unlikely, remove unlikely from the call sites.
Signed-off-by: Joe Perches <[email protected]>
---
drivers/net/stmmac/stmmac_main.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c
index c0dc785..20f803d 100644
--- a/drivers/net/stmmac/stmmac_main.c
+++ b/drivers/net/stmmac/stmmac_main.c
@@ -949,7 +949,7 @@ static int stmmac_sw_tso(struct stmmac_priv *priv, struct sk_buff *skb)
skb, skb->len);
segs = skb_gso_segment(skb, priv->dev->features & ~NETIF_F_TSO);
- if (unlikely(IS_ERR(segs)))
+ if (IS_ERR(segs))
goto sw_tso_end;
do {
--
1.7.3.3.464.gf80b6
IS_ERR already uses unlikely, remove unlikely from the call sites.
Signed-off-by: Joe Perches <[email protected]>
---
drivers/s390/scsi/zfcp_fsf.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index 2eb7dd5..722cdf5 100644
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -1553,7 +1553,7 @@ int zfcp_fsf_open_wka_port(struct zfcp_fc_wka_port *wka_port)
SBAL_FLAGS0_TYPE_READ,
qdio->adapter->pool.erp_req);
- if (unlikely(IS_ERR(req))) {
+ if (IS_ERR(req)) {
retval = PTR_ERR(req);
goto out;
}
@@ -1606,7 +1606,7 @@ int zfcp_fsf_close_wka_port(struct zfcp_fc_wka_port *wka_port)
SBAL_FLAGS0_TYPE_READ,
qdio->adapter->pool.erp_req);
- if (unlikely(IS_ERR(req))) {
+ if (IS_ERR(req)) {
retval = PTR_ERR(req);
goto out;
}
--
1.7.3.3.464.gf80b6
Tobias Klauser <[email protected]> sent a patch to remove
an unnecessary unlikely from drivers/misc/c2port/core.c,
https://lkml.org/lkml/2010/12/9/199
Here are the other instances treewide.
I think it'd be good if people would, when noticing defects in a
specific subsystem, look for and correct the same defect treewide.
IS_ERR already has an unlikely test so remove unnecessary
unlikelys from the call sites.
from: include/linux/err.h
#define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
[...]
static inline long __must_check IS_ERR(const void *ptr)
{
return IS_ERR_VALUE((unsigned long)ptr);
}
Sending directly to maintainers for now, will resend in a month
or so only to trivial if not picked up.
Joe Perches (15):
drm: Remove duplicate unlikely from IS_ERR
stmmac: Remove duplicate unlikely from IS_ERR
rtc: Remove duplicate unlikely from IS_ERR
s390: Remove duplicate unlikely from IS_ERR
osd: Remove duplicate unlikely from IS_ERR
serial: Remove duplicate unlikely from IS_ERR
brcm80211: Remove duplicate unlikely from IS_ERR
gadget: Remove duplicate unlikely from IS_ERR
exofs: Remove duplicate unlikely from IS_ERR
ext2: Remove duplicate unlikely from IS_ERR
ext3: Remove duplicate unlikely from IS_ERR
ext4: Remove duplicate unlikely from IS_ERR
nfs: Remove duplicate unlikely from IS_ERR
mm: Remove duplicate unlikely from IS_ERR
ipv6: Remove duplicate unlikely from IS_ERR
drivers/gpu/drm/ttm/ttm_tt.c | 4 ++--
drivers/net/stmmac/stmmac_main.c | 2 +-
drivers/rtc/rtc-bfin.c | 2 +-
drivers/s390/scsi/zfcp_fsf.c | 4 ++--
drivers/scsi/osd/osd_initiator.c | 2 +-
drivers/serial/msm_serial.c | 2 +-
drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 2 +-
drivers/usb/gadget/f_fs.c | 4 ++--
fs/exofs/super.c | 2 +-
fs/ext2/namei.c | 2 +-
fs/ext3/namei.c | 2 +-
fs/ext4/namei.c | 2 +-
fs/nfs/mount_clnt.c | 2 +-
mm/vmalloc.c | 2 +-
net/ipv6/af_inet6.c | 2 +-
15 files changed, 18 insertions(+), 18 deletions(-)
--
1.7.3.3.464.gf80b6
IS_ERR already uses unlikely, remove unlikely from the call sites.
Signed-off-by: Joe Perches <[email protected]>
---
mm/vmalloc.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index eb5cc7d..31dcb64 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -748,7 +748,7 @@ static struct vmap_block *new_vmap_block(gfp_t gfp_mask)
va = alloc_vmap_area(VMAP_BLOCK_SIZE, VMAP_BLOCK_SIZE,
VMALLOC_START, VMALLOC_END,
node, gfp_mask);
- if (unlikely(IS_ERR(va))) {
+ if (IS_ERR(va)) {
kfree(vb);
return ERR_CAST(va);
}
--
1.7.3.3.464.gf80b6
IS_ERR already uses unlikely, remove unlikely from the call sites.
Signed-off-by: Joe Perches <[email protected]>
---
net/ipv6/af_inet6.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 54e8e42..059a3de 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -810,7 +810,7 @@ static struct sk_buff *ipv6_gso_segment(struct sk_buff *skb, int features)
}
rcu_read_unlock();
- if (unlikely(IS_ERR(segs)))
+ if (IS_ERR(segs))
goto out;
for (skb = segs; skb; skb = skb->next) {
--
1.7.3.3.464.gf80b6
IS_ERR already uses unlikely, remove unlikely from the call sites.
Signed-off-by: Joe Perches <[email protected]>
---
fs/nfs/mount_clnt.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fs/nfs/mount_clnt.c b/fs/nfs/mount_clnt.c
index eceafe7..3f2a6be 100644
--- a/fs/nfs/mount_clnt.c
+++ b/fs/nfs/mount_clnt.c
@@ -248,7 +248,7 @@ void nfs_umount(const struct nfs_mount_request *info)
args.flags |= RPC_CLNT_CREATE_NONPRIVPORT;
clnt = rpc_create(&args);
- if (unlikely(IS_ERR(clnt)))
+ if (IS_ERR(clnt))
goto out_clnt_err;
dprintk("NFS: sending UMNT request for %s:%s\n",
--
1.7.3.3.464.gf80b6
IS_ERR already uses unlikely, remove unlikely from the call sites.
Signed-off-by: Joe Perches <[email protected]>
---
fs/ext3/namei.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
index bce9dce..268f776 100644
--- a/fs/ext3/namei.c
+++ b/fs/ext3/namei.c
@@ -1047,7 +1047,7 @@ static struct dentry *ext3_lookup(struct inode * dir, struct dentry *dentry, str
return ERR_PTR(-EIO);
}
inode = ext3_iget(dir->i_sb, ino);
- if (unlikely(IS_ERR(inode))) {
+ if (IS_ERR(inode)) {
if (PTR_ERR(inode) == -ESTALE) {
ext3_error(dir->i_sb, __func__,
"deleted inode referenced: %lu",
--
1.7.3.3.464.gf80b6
On Thu, Dec 9, 2010 at 15:03, Joe Perches wrote:
> IS_ERR already uses unlikely, remove unlikely from the call sites.
Tobias already submitted a patch for this. and i cc-ed you on it.
-mike
IS_ERR already uses unlikely, remove unlikely from the call sites.
Signed-off-by: Joe Perches <[email protected]>
---
fs/ext4/namei.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 92203b8..cec88ce 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -1036,7 +1036,7 @@ static struct dentry *ext4_lookup(struct inode *dir, struct dentry *dentry, stru
return ERR_PTR(-EIO);
}
inode = ext4_iget(dir->i_sb, ino);
- if (unlikely(IS_ERR(inode))) {
+ if (IS_ERR(inode)) {
if (PTR_ERR(inode) == -ESTALE) {
EXT4_ERROR_INODE(dir,
"deleted inode referenced: %u",
--
1.7.3.3.464.gf80b6
IS_ERR already uses unlikely, remove unlikely from the call sites.
Signed-off-by: Joe Perches <[email protected]>
---
drivers/gpu/drm/ttm/ttm_tt.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c
index af789dc..fb83a90 100644
--- a/drivers/gpu/drm/ttm/ttm_tt.c
+++ b/drivers/gpu/drm/ttm/ttm_tt.c
@@ -538,7 +538,7 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistant_swap_storage)
swap_storage = shmem_file_setup("ttm swap",
ttm->num_pages << PAGE_SHIFT,
0);
- if (unlikely(IS_ERR(swap_storage))) {
+ if (IS_ERR(swap_storage)) {
printk(KERN_ERR "Failed allocating swap storage.\n");
return PTR_ERR(swap_storage);
}
@@ -552,7 +552,7 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistant_swap_storage)
if (unlikely(from_page == NULL))
continue;
to_page = read_mapping_page(swap_space, i, NULL);
- if (unlikely(IS_ERR(to_page))) {
+ if (IS_ERR(to_page)) {
ret = PTR_ERR(to_page);
goto out_err;
}
--
1.7.3.3.464.gf80b6
IS_ERR already uses unlikely, remove unlikely from the call sites.
Signed-off-by: Joe Perches <[email protected]>
---
fs/ext2/namei.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fs/ext2/namei.c b/fs/ext2/namei.c
index f8aecd2..2e1d834 100644
--- a/fs/ext2/namei.c
+++ b/fs/ext2/namei.c
@@ -67,7 +67,7 @@ static struct dentry *ext2_lookup(struct inode * dir, struct dentry *dentry, str
inode = NULL;
if (ino) {
inode = ext2_iget(dir->i_sb, ino);
- if (unlikely(IS_ERR(inode))) {
+ if (IS_ERR(inode)) {
if (PTR_ERR(inode) == -ESTALE) {
ext2_error(dir->i_sb, __func__,
"deleted inode referenced: %lu",
--
1.7.3.3.464.gf80b6
IS_ERR already uses unlikely, remove unlikely from the call sites.
Signed-off-by: Joe Perches <[email protected]>
---
fs/exofs/super.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fs/exofs/super.c b/fs/exofs/super.c
index 79c3ae6..b2b12a8 100644
--- a/fs/exofs/super.c
+++ b/fs/exofs/super.c
@@ -488,7 +488,7 @@ static int exofs_read_lookup_dev_table(struct exofs_sb_info **psbi,
}
od = osduld_info_lookup(&odi);
- if (unlikely(IS_ERR(od))) {
+ if (IS_ERR(od)) {
ret = PTR_ERR(od);
EXOFS_ERR("ERROR: device requested is not found "
"osd_name-%s =>%d\n", odi.osdname, ret);
--
1.7.3.3.464.gf80b6
IS_ERR already uses unlikely, remove unlikely from the call sites.
Signed-off-by: Joe Perches <[email protected]>
---
drivers/usb/gadget/f_fs.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c
index a21349c..1499f9e 100644
--- a/drivers/usb/gadget/f_fs.c
+++ b/drivers/usb/gadget/f_fs.c
@@ -426,7 +426,7 @@ static ssize_t ffs_ep0_write(struct file *file, const char __user *buf,
}
data = ffs_prepare_buffer(buf, len);
- if (unlikely(IS_ERR(data))) {
+ if (IS_ERR(data)) {
ret = PTR_ERR(data);
break;
}
@@ -499,7 +499,7 @@ static ssize_t ffs_ep0_write(struct file *file, const char __user *buf,
spin_unlock_irq(&ffs->ev.waitq.lock);
data = ffs_prepare_buffer(buf, len);
- if (unlikely(IS_ERR(data))) {
+ if (IS_ERR(data)) {
ret = PTR_ERR(data);
break;
}
--
1.7.3.3.464.gf80b6
IS_ERR already uses unlikely, remove unlikely from the call sites.
Signed-off-by: Joe Perches <[email protected]>
---
drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
index 0d7aa4a..edf300d 100644
--- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
@@ -3196,7 +3196,7 @@ s32 wl_cfg80211_attach(struct net_device *ndev, void *data)
}
WL_DBG(("func %p\n", wl_cfg80211_get_sdio_func()));
wdev = wl_alloc_wdev(sizeof(struct wl_iface), &wl_cfg80211_get_sdio_func()->dev);
- if (unlikely(IS_ERR(wdev)))
+ if (IS_ERR(wdev))
return -ENOMEM;
wdev->iftype = wl_mode_to_nl80211_iftype(WL_MODE_BSS);
--
1.7.3.3.464.gf80b6
On Thu, 2010-12-09 at 15:06 -0500, Mike Frysinger wrote:
> On Thu, Dec 9, 2010 at 15:03, Joe Perches wrote:
> > IS_ERR already uses unlikely, remove unlikely from the call sites.
> Tobias already submitted a patch for this.
Thanks Tobias. Turns out you did them all after all.
Could you please cc linux-kernel for these sorts of patches?
As far as I can tell, the rtc-bfin patch didn't hit lkml,
only the c2port patch did for whatever reason.
The patches aren't marked as an n/m series which would also help
identify the patch scope. I thought it was a singleton.
Jiri and all others, please ignore my duplicate patchset.
cheers, Joe
On Thu, 2010-12-09 at 12:03 -0800, Joe Perches wrote:
> Tobias Klauser <[email protected]> sent a patch to remove
> an unnecessary unlikely from drivers/misc/c2port/core.c,
> https://lkml.org/lkml/2010/12/9/199
It seems that Tobias did send all the appropriate patches,
not as a series, but as individual patches to kernel-janitor.
c2port was the only one that went to lkml.
Please ignore this series and apply Tobias' patches.
On Thu, Dec 09, 2010 at 12:03:59PM -0800, Joe Perches wrote:
> IS_ERR already uses unlikely, remove unlikely from the call sites.
>
> Signed-off-by: Joe Perches <[email protected]>
> ---
> drivers/serial/msm_serial.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
Tobias Klauser <[email protected]> already posted a patch about
this. They are identical, so I'll grab the first one from Tobias.
Thanks,
David