git.openwrt.org Git - openwrt/staging/neocturne.git/blob

   1 From db282fbb46900d381eec2ef3d15cf84c5048b120 Mon Sep 17 00:00:00 2001
   2 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
   3 Date: Thu, 16 Feb 2023 00:29:51 +0200
   4 Subject: [PATCH] media: i2c: imx290: Match kernel coding style on
   5  whitespace
   6
   7 Should be upstream commit 76d1bd4f0f45
   8
   9 Fix up a couple of coding style issues regarding missing blank
  10 lines after declarations, double blank lines, and incorrect
  11 indentation.
  12
  13 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  14 Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  15 Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  16 Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
  17 ---
  18  drivers/media/i2c/imx290.c | 9 ++++-----
  19  1 file changed, 4 insertions(+), 5 deletions(-)
  20
  21 --- a/drivers/media/i2c/imx290.c
  22 +++ b/drivers/media/i2c/imx290.c
  23 @@ -109,7 +109,6 @@
  24
  25  #define IMX290_VMAX_DEFAULT                            1125
  26
  27 -
  28  /*
  29   * The IMX290 pixel array is organized as follows:
  30   *
  31 @@ -353,6 +352,7 @@ static const s64 imx290_link_freq_2lanes
  32         [FREQ_INDEX_1080P] = 445500000,
  33         [FREQ_INDEX_720P] = 297000000,
  34  };
  35 +
  36  static const s64 imx290_link_freq_4lanes[] = {
  37         [FREQ_INDEX_1080P] = 222750000,
  38         [FREQ_INDEX_720P] = 148500000,
  39 @@ -488,7 +488,7 @@ static int __always_unused imx290_read(s
  40                               data, (addr >> IMX290_REG_SIZE_SHIFT) & 3);
  41         if (ret < 0) {
  42                 dev_err(imx290->dev, "%u-bit read from 0x%04x failed: %d\n",
  43 -                        ((addr >> IMX290_REG_SIZE_SHIFT) & 3) * 8,
  44 +                       ((addr >> IMX290_REG_SIZE_SHIFT) & 3) * 8,
  45                          addr & IMX290_REG_ADDR_MASK, ret);
  46                 return ret;
  47         }
  48 @@ -511,7 +511,7 @@ static int imx290_write(struct imx290 *i
  49                                data, (addr >> IMX290_REG_SIZE_SHIFT) & 3);
  50         if (ret < 0) {
  51                 dev_err(imx290->dev, "%u-bit write to 0x%04x failed: %d\n",
  52 -                        ((addr >> IMX290_REG_SIZE_SHIFT) & 3) * 8,
  53 +                       ((addr >> IMX290_REG_SIZE_SHIFT) & 3) * 8,
  54                          addr & IMX290_REG_ADDR_MASK, ret);
  55                 if (err)
  56                         *err = ret;
  57 @@ -777,8 +777,7 @@ static int imx290_start_streaming(struct
  58
  59         /* Set init register settings */
  60         ret = imx290_set_register_array(imx290, imx290_global_init_settings,
  61 -                                       ARRAY_SIZE(
  62 -                                               imx290_global_init_settings));
  63 +                                       ARRAY_SIZE(imx290_global_init_settings));
  64         if (ret < 0) {
  65                 dev_err(imx290->dev, "Could not set init registers\n");
  66                 return ret;