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

[Manoj Kumar <manoj@linux.vnet.ibm.com>]

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