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

Commit 7e89bd9f authored by Lad, Prabhakar's avatar Lad, Prabhakar Committed by Mauro Carvalho Chehab
Browse files

[media] media: i2c: remove duplicate checks for EPERM in dbg_g/s_register 



This patch removes check for EPERM in dbg_g/s_register of subdevice
drivers as this check is already performed by core.

Signed-off-by: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 39cc029f

drivers/media/i2c/ad9389b.c

+0 −4
Original line number Diff line number Diff line
@@ -347,8 +347,6 @@ static int ad9389b_g_register(struct v4l2_subdev *sd, struct v4l2_dbg_register * 


	if (!v4l2_chip_match_i2c_client(client, &reg->match))

		return -EINVAL;

	if (!capable(CAP_SYS_ADMIN))

		return -EPERM;

	reg->val = ad9389b_rd(sd, reg->reg & 0xff);

	reg->size = 1;

	return 0;
@@ -360,8 +358,6 @@ static int ad9389b_s_register(struct v4l2_subdev *sd, const struct v4l2_dbg_regi 


	if (!v4l2_chip_match_i2c_client(client, &reg->match))

		return -EINVAL;

	if (!capable(CAP_SYS_ADMIN))

		return -EPERM;

	ad9389b_wr(sd, reg->reg & 0xff, reg->val & 0xff);

	return 0;

}

drivers/media/i2c/adv7183.c

+0 −4
Original line number Diff line number Diff line
@@ -500,8 +500,6 @@ static int adv7183_g_register(struct v4l2_subdev *sd, struct v4l2_dbg_register * 


	if (!v4l2_chip_match_i2c_client(client, &reg->match))

		return -EINVAL;

	if (!capable(CAP_SYS_ADMIN))

		return -EPERM;

	reg->val = adv7183_read(sd, reg->reg & 0xff);

	reg->size = 1;

	return 0;
@@ -513,8 +511,6 @@ static int adv7183_s_register(struct v4l2_subdev *sd, const struct v4l2_dbg_regi 


	if (!v4l2_chip_match_i2c_client(client, &reg->match))

		return -EINVAL;

	if (!capable(CAP_SYS_ADMIN))

		return -EPERM;

	adv7183_write(sd, reg->reg & 0xff, reg->val & 0xff);

	return 0;

}

drivers/media/i2c/adv7604.c

+0 −4
Original line number Diff line number Diff line
@@ -647,8 +647,6 @@ static int adv7604_g_register(struct v4l2_subdev *sd, 


	if (!v4l2_chip_match_i2c_client(client, &reg->match))

		return -EINVAL;

	if (!capable(CAP_SYS_ADMIN))

		return -EPERM;

	reg->size = 1;

	switch (reg->reg >> 8) {

	case 0:
@@ -705,8 +703,6 @@ static int adv7604_s_register(struct v4l2_subdev *sd, 


	if (!v4l2_chip_match_i2c_client(client, &reg->match))

		return -EINVAL;

	if (!capable(CAP_SYS_ADMIN))

		return -EPERM;

	switch (reg->reg >> 8) {

	case 0:

		io_write(sd, reg->reg & 0xff, reg->val & 0xff);

drivers/media/i2c/cs5345.c

+0 −4
Original line number Diff line number Diff line
@@ -103,8 +103,6 @@ static int cs5345_g_register(struct v4l2_subdev *sd, struct v4l2_dbg_register *r 


	if (!v4l2_chip_match_i2c_client(client, &reg->match))

		return -EINVAL;

	if (!capable(CAP_SYS_ADMIN))

		return -EPERM;

	reg->size = 1;

	reg->val = cs5345_read(sd, reg->reg & 0x1f);

	return 0;
@@ -116,8 +114,6 @@ static int cs5345_s_register(struct v4l2_subdev *sd, const struct v4l2_dbg_regis 


	if (!v4l2_chip_match_i2c_client(client, &reg->match))

		return -EINVAL;

	if (!capable(CAP_SYS_ADMIN))

		return -EPERM;

	cs5345_write(sd, reg->reg & 0x1f, reg->val & 0xff);

	return 0;

}

drivers/media/i2c/cx25840/cx25840-core.c

+0 −4
Original line number Diff line number Diff line
@@ -1664,8 +1664,6 @@ static int cx25840_g_register(struct v4l2_subdev *sd, struct v4l2_dbg_register * 


	if (!v4l2_chip_match_i2c_client(client, &reg->match))

		return -EINVAL;

	if (!capable(CAP_SYS_ADMIN))

		return -EPERM;

	reg->size = 1;

	reg->val = cx25840_read(client, reg->reg & 0x0fff);

	return 0;
@@ -1677,8 +1675,6 @@ static int cx25840_s_register(struct v4l2_subdev *sd, const struct v4l2_dbg_regi 


	if (!v4l2_chip_match_i2c_client(client, &reg->match))

		return -EINVAL;

	if (!capable(CAP_SYS_ADMIN))

		return -EPERM;

	cx25840_write(client, reg->reg & 0x0fff, reg->val & 0xff);

	return 0;

}