mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-09 06:43:09 +00:00
media: i2c: max96714: coding style fixes
Coding style fixes suggested by Sakari during the driver review. Reviewed-by: Tommaso Merciai <tomm.merciai@gmail.com> Tested-by: Tommaso Merciai <tomm.merciai@gmail.com> Signed-off-by: Julien Massot <julien.massot@collabora.com> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
This commit is contained in:
parent
24fe3eb1a5
commit
4596c55e9a
@ -25,6 +25,7 @@
|
||||
#define MAX96714_NPORTS 2
|
||||
#define MAX96714_PAD_SINK 0
|
||||
#define MAX96714_PAD_SOURCE 1
|
||||
#define MAX96714_CSI_NLANES 4
|
||||
|
||||
/* DEV */
|
||||
#define MAX96714_REG13 CCI_REG8(0x0d)
|
||||
@ -52,9 +53,9 @@
|
||||
#define MAX96714_PATGEN_V2D CCI_REG24(0x254)
|
||||
#define MAX96714_PATGEN_DE_HIGH CCI_REG16(0x257)
|
||||
#define MAX96714_PATGEN_DE_LOW CCI_REG16(0x259)
|
||||
#define MAX96714_PATGEN_DE_CNT CCI_REG16(0x25B)
|
||||
#define MAX96714_PATGEN_DE_CNT CCI_REG16(0x25b)
|
||||
#define MAX96714_PATGEN_GRAD_INC CCI_REG8(0x25d)
|
||||
#define MAX96714_PATGEN_CHKB_COLOR_A CCI_REG24(0x25E)
|
||||
#define MAX96714_PATGEN_CHKB_COLOR_A CCI_REG24(0x25e)
|
||||
#define MAX96714_PATGEN_CHKB_COLOR_B CCI_REG24(0x261)
|
||||
#define MAX96714_PATGEN_CHKB_RPT_CNT_A CCI_REG8(0x264)
|
||||
#define MAX96714_PATGEN_CHKB_RPT_CNT_B CCI_REG8(0x265)
|
||||
@ -724,8 +725,9 @@ static int max96714_init_tx_port(struct max96714_priv *priv)
|
||||
* Unused lanes need to be mapped as well to not have
|
||||
* the same lanes mapped twice.
|
||||
*/
|
||||
for (; lane < 4; lane++) {
|
||||
unsigned int idx = find_first_zero_bit(&lanes_used, 4);
|
||||
for (; lane < MAX96714_CSI_NLANES; lane++) {
|
||||
unsigned int idx = find_first_zero_bit(&lanes_used,
|
||||
MAX96714_CSI_NLANES);
|
||||
|
||||
val |= idx << (lane * 2);
|
||||
lanes_used |= BIT(idx);
|
||||
@ -757,9 +759,7 @@ static int max96714_rxport_disable_poc(struct max96714_priv *priv)
|
||||
static int max96714_parse_dt_txport(struct max96714_priv *priv)
|
||||
{
|
||||
struct device *dev = &priv->client->dev;
|
||||
struct v4l2_fwnode_endpoint vep = {
|
||||
.bus_type = V4L2_MBUS_CSI2_DPHY
|
||||
};
|
||||
struct v4l2_fwnode_endpoint vep = { .bus_type = V4L2_MBUS_CSI2_DPHY };
|
||||
struct fwnode_handle *ep_fwnode;
|
||||
u32 num_data_lanes;
|
||||
int ret;
|
||||
@ -791,14 +791,14 @@ static int max96714_parse_dt_txport(struct max96714_priv *priv)
|
||||
}
|
||||
|
||||
num_data_lanes = vep.bus.mipi_csi2.num_data_lanes;
|
||||
if (num_data_lanes < 1 || num_data_lanes > 4) {
|
||||
if (num_data_lanes < 1 || num_data_lanes > MAX96714_CSI_NLANES) {
|
||||
dev_err(dev,
|
||||
"tx: invalid number of data lanes must be 1 to 4\n");
|
||||
ret = -EINVAL;
|
||||
goto err_free_vep;
|
||||
}
|
||||
|
||||
memcpy(&priv->mipi_csi2, &vep.bus.mipi_csi2, sizeof(priv->mipi_csi2));
|
||||
priv->mipi_csi2 = vep.bus.mipi_csi2;
|
||||
|
||||
err_free_vep:
|
||||
v4l2_fwnode_endpoint_free(&vep);
|
||||
|
Loading…
Reference in New Issue
Block a user