Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 876e32e5 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: tw9910: solve coding style issues 



As we're adding this as a new driver, make checkpatch happier by
solving several style issues, using --fix-inplace at strict mode.

Some issues required manual work.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 054d8830

drivers/media/i2c/tw9910.c

+16 −16
Original line number Original line Diff line number Diff line
@@ -339,6 +339,7 @@ static int tw9910_mask_set(struct i2c_client *client, u8 command, 
			   u8 mask, u8 set)

			   u8 mask, u8 set)

{

{

	s32 val = i2c_smbus_read_byte_data(client, command);

	s32 val = i2c_smbus_read_byte_data(client, command);



	if (val < 0)

	if (val < 0)

		return val;

		return val;
@@ -389,7 +390,7 @@ static int tw9910_set_hsync(struct i2c_client *client) 




	/* So far only revisions 0 and 1 have been seen */

	/* So far only revisions 0 and 1 have been seen */

	/* bit 2 - 0 */

	/* bit 2 - 0 */

	if (1 == priv->revision)

	if (priv->revision == 1)

		ret = tw9910_mask_set(client, HSLOWCTL, 0x77,

		ret = tw9910_mask_set(client, HSLOWCTL, 0x77,

				      (HSYNC_START & 0x0007) << 4 |

				      (HSYNC_START & 0x0007) << 4 |

				      (HSYNC_END   & 0x0007));

				      (HSYNC_END   & 0x0007));
@@ -511,10 +512,10 @@ static int tw9910_s_std(struct v4l2_subdev *sd, v4l2_std_id norm) 
{

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct tw9910_priv *priv = to_tw9910(client);

	struct tw9910_priv *priv = to_tw9910(client);

	const unsigned hact = 720;

	const unsigned int hact = 720;

	const unsigned hdelay = 15;

	const unsigned int hdelay = 15;

	unsigned vact;

	unsigned int vact;

	unsigned vdelay;

	unsigned int vdelay;

	int ret;

	int ret;





	if (!(norm & (V4L2_STD_NTSC | V4L2_STD_PAL)))

	if (!(norm & (V4L2_STD_NTSC | V4L2_STD_PAL)))
@@ -818,9 +819,9 @@ static int tw9910_set_fmt(struct v4l2_subdev *sd, 
	if (format->pad)

	if (format->pad)

		return -EINVAL;

		return -EINVAL;





	if (V4L2_FIELD_ANY == mf->field) {

	if (mf->field == V4L2_FIELD_ANY) {

		mf->field = V4L2_FIELD_INTERLACED_BT;

		mf->field = V4L2_FIELD_INTERLACED_BT;

	} else if (V4L2_FIELD_INTERLACED_BT != mf->field) {

	} else if (mf->field != V4L2_FIELD_INTERLACED_BT) {

		dev_err(&client->dev, "Field type %d invalid.\n", mf->field);

		dev_err(&client->dev, "Field type %d invalid.\n", mf->field);

		return -EINVAL;

		return -EINVAL;

	}

	}
@@ -870,8 +871,7 @@ static int tw9910_video_probe(struct i2c_client *client) 
	priv->revision = GET_REV(id);

	priv->revision = GET_REV(id);

	id = GET_ID(id);

	id = GET_ID(id);





	if (0x0B != id ||

	if (id != 0x0b || priv->revision > 0x01) {

	    0x01 < priv->revision) {

		dev_err(&client->dev,

		dev_err(&client->dev,

			"Product ID error %x:%x\n",

			"Product ID error %x:%x\n",

			id, priv->revision);

			id, priv->revision);