Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1237416

Re: [PATCH 3/3] cxlflash: drop unlikely before IS_ERR_OR_NULL

Show all headers | View raw

Geliang:

Thanks for catching this.

- Manoj

Acked-by: Manoj Kumar <manoj@linux.vnet.ibm.com>


On 9/30/2015 9:55 PM, Geliang Tang wrote:
> IS_ERR_OR_NULL already contain an unlikely compiler flag. Drop it.
>
> Signed-off-by: Geliang Tang <geliangtang@163.com>
> ---
>   drivers/scsi/cxlflash/superpipe.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/scsi/cxlflash/superpipe.c b/drivers/scsi/cxlflash/superpipe.c
> index f1b62ce..eb1b01e 100644
> --- a/drivers/scsi/cxlflash/superpipe.c
> +++ b/drivers/scsi/cxlflash/superpipe.c
> @@ -1307,7 +1307,7 @@ static int cxlflash_disk_attach(struct scsi_device *sdev,
>   	}
>
>   	ctx = cxl_dev_context_init(cfg->dev);
> -	if (unlikely(IS_ERR_OR_NULL(ctx))) {
> +	if (IS_ERR_OR_NULL(ctx)) {
>   		dev_err(dev, "%s: Could not initialize context %p\n",
>   			__func__, ctx);
>   		rc = -ENODEV;
> @@ -1432,7 +1432,7 @@ static int recover_context(struct cxlflash_cfg *cfg, struct ctx_info *ctxi)
>   	struct afu *afu = cfg->afu;
>
>   	ctx = cxl_dev_context_init(cfg->dev);
> -	if (unlikely(IS_ERR_OR_NULL(ctx))) {
> +	if (IS_ERR_OR_NULL(ctx)) {
>   		dev_err(dev, "%s: Could not initialize context %p\n",
>   			__func__, ctx);
>   		rc = -ENODEV;
>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 3/3] cxlflash: drop unlikely before IS_ERR_OR_NULL Geliang Tang <geliangtang@163.com> - 2015-10-01 05:00 +0200
  Re: [PATCH 3/3] cxlflash: drop unlikely before IS_ERR_OR_NULL Manoj Kumar <manoj@linux.vnet.ibm.com> - 2015-10-01 15:10 +0200
  Re: [PATCH 3/3] cxlflash: drop unlikely before IS_ERR_OR_NULL "Matthew R. Ochs" <mrochs@linux.vnet.ibm.com> - 2015-10-01 16:50 +0200

csiph-web