From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6960EC433DF for ; Thu, 11 Jun 2020 15:51:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 425052075E for ; Thu, 11 Jun 2020 15:51:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591890697; bh=D4qOfF+EtsIO3+5PMIG2xLRbHUbv3FfAUcE0uae6gdI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=vPqSlKewGxqA+a5OK3F9oHY44PwTGsv2/bFUt0OzRtn97HSVeUZqOt9DJNKU4neR7 HCWrpk8y+Y0fWbM+9eJI5Vp8E10OBuTYBlylwOQJEuA0yHDFnHBN+2wtgaRbxhtQ/x UfqN2I3CoDyuEkgzmGLfa5qQGC16HzXrw3bcec/o= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728624AbgFKPvg (ORCPT ); Thu, 11 Jun 2020 11:51:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:45208 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728605AbgFKPvg (ORCPT ); Thu, 11 Jun 2020 11:51:36 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 328AE206A4; Thu, 11 Jun 2020 15:51:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591890694; bh=D4qOfF+EtsIO3+5PMIG2xLRbHUbv3FfAUcE0uae6gdI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=2lG6wkWNJdRjST9yNoa5TMn/IA4lx348cBSh4mtX6SEE0fv7YfQRC7KyjpwiZ0ObT T3nL+DzEtk7HkVvrj5lnnzmO/XgSN85HQwBKGXn4n0hGBurluL/4I3eGB7/uJXbdmo BiB15E48mLCFZcHjk88wJVsZzMBpwlbYCNqypFX8= Date: Thu, 11 Jun 2020 17:51:28 +0200 From: Greg KH To: Dafna Hirschfeld Cc: linux-media@vger.kernel.org, laurent.pinchart@ideasonboard.com, helen.koike@collabora.com, ezequiel@collabora.com, hverkuil@xs4all.nl, kernel@collabora.com, dafna3@gmail.com, sakari.ailus@linux.intel.com, linux-rockchip@lists.infradead.org, mchehab@kernel.org, tfiga@chromium.org, stable@vger.kernel.org Subject: Re: [RESEND PATCH v3 3/6] media: staging: rkisp1: remove macro RKISP1_DIR_SINK_SRC Message-ID: <20200611155128.GF1456044@kroah.com> References: <20200611154551.25022-1-dafna.hirschfeld@collabora.com> <20200611154551.25022-4-dafna.hirschfeld@collabora.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200611154551.25022-4-dafna.hirschfeld@collabora.com> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Thu, Jun 11, 2020 at 05:45:48PM +0200, Dafna Hirschfeld wrote: > The macro RKISP1_DIR_SINK_SRC is a mask of two flags. > The macro hides the fact that it's a mask and the code > is actually more clear if we replace it the with bitwise-or explicitly. > > Signed-off-by: Dafna Hirschfeld > --- > drivers/staging/media/rkisp1/rkisp1-common.h | 1 - > drivers/staging/media/rkisp1/rkisp1-isp.c | 24 ++++++++++---------- > 2 files changed, 12 insertions(+), 13 deletions(-) > > diff --git a/drivers/staging/media/rkisp1/rkisp1-common.h b/drivers/staging/media/rkisp1/rkisp1-common.h > index 39d8e46d8d8a..0ec8718037a4 100644 > --- a/drivers/staging/media/rkisp1/rkisp1-common.h > +++ b/drivers/staging/media/rkisp1/rkisp1-common.h > @@ -24,7 +24,6 @@ > > #define RKISP1_DIR_SRC BIT(0) > #define RKISP1_DIR_SINK BIT(1) > -#define RKISP1_DIR_SINK_SRC (RKISP1_DIR_SINK | RKISP1_DIR_SRC) > > #define RKISP1_ISP_MAX_WIDTH 4032 > #define RKISP1_ISP_MAX_HEIGHT 3024 > diff --git a/drivers/staging/media/rkisp1/rkisp1-isp.c b/drivers/staging/media/rkisp1/rkisp1-isp.c > index e66e87d6ea8b..157ac58c2efc 100644 > --- a/drivers/staging/media/rkisp1/rkisp1-isp.c > +++ b/drivers/staging/media/rkisp1/rkisp1-isp.c > @@ -65,84 +65,84 @@ static const struct rkisp1_isp_mbus_info rkisp1_isp_formats[] = { > .mipi_dt = RKISP1_CIF_CSI2_DT_RAW10, > .bayer_pat = RKISP1_RAW_RGGB, > .bus_width = 10, > - .direction = RKISP1_DIR_SINK_SRC, > + .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, > }, { > .mbus_code = MEDIA_BUS_FMT_SBGGR10_1X10, > .pixel_enc = V4L2_PIXEL_ENC_BAYER, > .mipi_dt = RKISP1_CIF_CSI2_DT_RAW10, > .bayer_pat = RKISP1_RAW_BGGR, > .bus_width = 10, > - .direction = RKISP1_DIR_SINK_SRC, > + .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, > }, { > .mbus_code = MEDIA_BUS_FMT_SGBRG10_1X10, > .pixel_enc = V4L2_PIXEL_ENC_BAYER, > .mipi_dt = RKISP1_CIF_CSI2_DT_RAW10, > .bayer_pat = RKISP1_RAW_GBRG, > .bus_width = 10, > - .direction = RKISP1_DIR_SINK_SRC, > + .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, > }, { > .mbus_code = MEDIA_BUS_FMT_SGRBG10_1X10, > .pixel_enc = V4L2_PIXEL_ENC_BAYER, > .mipi_dt = RKISP1_CIF_CSI2_DT_RAW10, > .bayer_pat = RKISP1_RAW_GRBG, > .bus_width = 10, > - .direction = RKISP1_DIR_SINK_SRC, > + .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, > }, { > .mbus_code = MEDIA_BUS_FMT_SRGGB12_1X12, > .pixel_enc = V4L2_PIXEL_ENC_BAYER, > .mipi_dt = RKISP1_CIF_CSI2_DT_RAW12, > .bayer_pat = RKISP1_RAW_RGGB, > .bus_width = 12, > - .direction = RKISP1_DIR_SINK_SRC, > + .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, > }, { > .mbus_code = MEDIA_BUS_FMT_SBGGR12_1X12, > .pixel_enc = V4L2_PIXEL_ENC_BAYER, > .mipi_dt = RKISP1_CIF_CSI2_DT_RAW12, > .bayer_pat = RKISP1_RAW_BGGR, > .bus_width = 12, > - .direction = RKISP1_DIR_SINK_SRC, > + .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, > }, { > .mbus_code = MEDIA_BUS_FMT_SGBRG12_1X12, > .pixel_enc = V4L2_PIXEL_ENC_BAYER, > .mipi_dt = RKISP1_CIF_CSI2_DT_RAW12, > .bayer_pat = RKISP1_RAW_GBRG, > .bus_width = 12, > - .direction = RKISP1_DIR_SINK_SRC, > + .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, > }, { > .mbus_code = MEDIA_BUS_FMT_SGRBG12_1X12, > .pixel_enc = V4L2_PIXEL_ENC_BAYER, > .mipi_dt = RKISP1_CIF_CSI2_DT_RAW12, > .bayer_pat = RKISP1_RAW_GRBG, > .bus_width = 12, > - .direction = RKISP1_DIR_SINK_SRC, > + .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, > }, { > .mbus_code = MEDIA_BUS_FMT_SRGGB8_1X8, > .pixel_enc = V4L2_PIXEL_ENC_BAYER, > .mipi_dt = RKISP1_CIF_CSI2_DT_RAW8, > .bayer_pat = RKISP1_RAW_RGGB, > .bus_width = 8, > - .direction = RKISP1_DIR_SINK_SRC, > + .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, > }, { > .mbus_code = MEDIA_BUS_FMT_SBGGR8_1X8, > .pixel_enc = V4L2_PIXEL_ENC_BAYER, > .mipi_dt = RKISP1_CIF_CSI2_DT_RAW8, > .bayer_pat = RKISP1_RAW_BGGR, > .bus_width = 8, > - .direction = RKISP1_DIR_SINK_SRC, > + .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, > }, { > .mbus_code = MEDIA_BUS_FMT_SGBRG8_1X8, > .pixel_enc = V4L2_PIXEL_ENC_BAYER, > .mipi_dt = RKISP1_CIF_CSI2_DT_RAW8, > .bayer_pat = RKISP1_RAW_GBRG, > .bus_width = 8, > - .direction = RKISP1_DIR_SINK_SRC, > + .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, > }, { > .mbus_code = MEDIA_BUS_FMT_SGRBG8_1X8, > .pixel_enc = V4L2_PIXEL_ENC_BAYER, > .mipi_dt = RKISP1_CIF_CSI2_DT_RAW8, > .bayer_pat = RKISP1_RAW_GRBG, > .bus_width = 8, > - .direction = RKISP1_DIR_SINK_SRC, > + .direction = RKISP1_DIR_SINK | RKISP1_DIR_SRC, > }, { > .mbus_code = MEDIA_BUS_FMT_YUYV8_1X16, > .pixel_enc = V4L2_PIXEL_ENC_YUV, > -- > 2.17.1 > This is not the correct way to submit patches for inclusion in the stable kernel tree. Please read: https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html for how to do this properly.