From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg KH Subject: Re: [RESEND PATCH v3 3/6] media: staging: rkisp1: remove macro RKISP1_DIR_SINK_SRC Date: Thu, 11 Jun 2020 17:51:28 +0200 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 Return-path: Content-Disposition: inline In-Reply-To: <20200611154551.25022-4-dafna.hirschfeld@collabora.com> Sender: linux-media-owner@vger.kernel.org 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 List-Id: linux-rockchip.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.