Re: [PATCH 11/15] drivers: target: Drop unlikely before IS_ERR(_OR_NULL)

From: Nicholas A. Bellinger
Date: Mon Aug 03 2015 - 01:45:55 EST


On Fri, 2015-07-31 at 14:08 +0530, Viresh Kumar wrote:
> IS_ERR(_OR_NULL) already contain an 'unlikely' compiler flag and there
> is no need to do that again from its callers. Drop it.
>
> Signed-off-by: Viresh Kumar <viresh.kumar@xxxxxxxxxx>
> ---
> drivers/target/tcm_fc/tfc_cmd.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/target/tcm_fc/tfc_cmd.c b/drivers/target/tcm_fc/tfc_cmd.c
> index 68031723e5be..aa3caca8bace 100644
> --- a/drivers/target/tcm_fc/tfc_cmd.c
> +++ b/drivers/target/tcm_fc/tfc_cmd.c
> @@ -255,7 +255,7 @@ static void ft_recv_seq(struct fc_seq *sp, struct fc_frame *fp, void *arg)
> struct ft_cmd *cmd = arg;
> struct fc_frame_header *fh;
>
> - if (unlikely(IS_ERR(fp))) {
> + if (IS_ERR(fp)) {
> /* XXX need to find cmd if queued */
> cmd->seq = NULL;
> cmd->aborted = true;

Looks fine. Applied to target-pending/for-next.

Thanks Viresh!

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