From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Date: Tue, 3 Aug 2021 13:36:58 +0000 (+0200)
Subject: Merge commit 'c3cdc019a6bf' into media_tree
X-Git-Tag: v5.15-rc1~149^2~51
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a7a48b40c7990749b933250aca5030b3a0bad193;p=thirdparty%2Fkernel%2Flinux.git

Merge commit 'c3cdc019a6bf' into media_tree

* commit 'c3cdc019a6bf':
  media: atomisp: pci: reposition braces as per coding style
  media: atomisp: i2c: Remove a superfluous else clause in atomisp-mt9m114.c
  media: atomisp: Move MIPI_PORT_LANES to the only user
  media: atomisp: Perform a single memset() for union
  media: atomisp: pci: fix error return code in atomisp_pci_probe()
  media: atomisp: pci: Remove unnecessary (void *) cast
  media: atomisp: pci: Remove checks before kfree/kvfree
  media: atomisp: Remove unused port_enabled variable
  media: atomisp: Annotate a couple of definitions with __maybe_unused
  media: atomisp: Remove unused declarations
  media: atomisp: remove the repeated declaration
  media: atomisp: improve error handling in gc2235_detect()
  media: atomisp: Fix whitespace at the beginning of line
  media: atomisp: Align block comments
  media: atomisp: Use sysfs_emit() instead of sprintf() where appropriate
  media: atomisp: Fix line continuation style issue in sh_css.c
  media: atomisp: Use kcalloc instead of kzalloc with multiply in sh_css.c
  media: atomisp: Remove unnecessary parens in sh_css.c
  media: atomisp: Resolve goto style issue in sh_css.c
  media: atomisp: fix the uninitialized use and rename "retvalue"
---

a7a48b40c7990749b933250aca5030b3a0bad193