2017-03-24 16:03:22

by Arushi Singhal

Subject: [PATCH v2] staging: media: omap4iss: Replace a bit shift by a use of BIT.

This patch replaces bit shifting on 1 with the BIT(x) macro.
This was done with coccinelle:
@@
constant c;
@@

-1 << c
+BIT(c)

Signed-off-by: Arushi Singhal <[email protected]>
---
changes in v2
-Remove unnecessary parenthesis

drivers/staging/media/omap4iss/iss_csi2.c | 2 +-
drivers/staging/media/omap4iss/iss_ipipe.c | 2 +-
drivers/staging/media/omap4iss/iss_ipipeif.c | 2 +-
drivers/staging/media/omap4iss/iss_resizer.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/media/omap4iss/iss_csi2.c b/drivers/staging/media/omap4iss/iss_csi2.c
index f71d5f2f179f..f6acc541e8a2 100644
--- a/drivers/staging/media/omap4iss/iss_csi2.c
+++ b/drivers/staging/media/omap4iss/iss_csi2.c
@@ -1268,7 +1268,7 @@ static int csi2_init_entities(struct iss_csi2_device *csi2, const char *subname)
snprintf(name, sizeof(name), "CSI2%s", subname);
snprintf(sd->name, sizeof(sd->name), "OMAP4 ISS %s", name);

- sd->grp_id = 1 << 16; /* group ID for iss subdevs */
+ sd->grp_id = BIT(16); /* group ID for iss subdevs */
v4l2_set_subdevdata(sd, csi2);
sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;

diff --git a/drivers/staging/media/omap4iss/iss_ipipe.c b/drivers/staging/media/omap4iss/iss_ipipe.c
index d38782e8e84c..d86ef8a031f2 100644
--- a/drivers/staging/media/omap4iss/iss_ipipe.c
+++ b/drivers/staging/media/omap4iss/iss_ipipe.c
@@ -508,7 +508,7 @@ static int ipipe_init_entities(struct iss_ipipe_device *ipipe)
v4l2_subdev_init(sd, &ipipe_v4l2_ops);
sd->internal_ops = &ipipe_v4l2_internal_ops;
strlcpy(sd->name, "OMAP4 ISS ISP IPIPE", sizeof(sd->name));
- sd->grp_id = 1 << 16; /* group ID for iss subdevs */
+ sd->grp_id = BIT(16); /* group ID for iss subdevs */
v4l2_set_subdevdata(sd, ipipe);
sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;

diff --git a/drivers/staging/media/omap4iss/iss_ipipeif.c b/drivers/staging/media/omap4iss/iss_ipipeif.c
index 23de8330731d..cb88b2bd0d82 100644
--- a/drivers/staging/media/omap4iss/iss_ipipeif.c
+++ b/drivers/staging/media/omap4iss/iss_ipipeif.c
@@ -739,7 +739,7 @@ static int ipipeif_init_entities(struct iss_ipipeif_device *ipipeif)
v4l2_subdev_init(sd, &ipipeif_v4l2_ops);
sd->internal_ops = &ipipeif_v4l2_internal_ops;
strlcpy(sd->name, "OMAP4 ISS ISP IPIPEIF", sizeof(sd->name));
- sd->grp_id = 1 << 16; /* group ID for iss subdevs */
+ sd->grp_id = BIT(16); /* group ID for iss subdevs */
v4l2_set_subdevdata(sd, ipipeif);
sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;

diff --git a/drivers/staging/media/omap4iss/iss_resizer.c b/drivers/staging/media/omap4iss/iss_resizer.c
index f1d352c711d5..4bbfa20b3c38 100644
--- a/drivers/staging/media/omap4iss/iss_resizer.c
+++ b/drivers/staging/media/omap4iss/iss_resizer.c
@@ -782,7 +782,7 @@ static int resizer_init_entities(struct iss_resizer_device *resizer)
v4l2_subdev_init(sd, &resizer_v4l2_ops);
sd->internal_ops = &resizer_v4l2_internal_ops;
strlcpy(sd->name, "OMAP4 ISS ISP resizer", sizeof(sd->name));
- sd->grp_id = 1 << 16; /* group ID for iss subdevs */
+ sd->grp_id = BIT(16); /* group ID for iss subdevs */
v4l2_set_subdevdata(sd, resizer);
sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;

--
2.11.0

2017-03-26 17:57:08

by Laurent Pinchart

Subject: Re: [PATCH v2] staging: media: omap4iss: Replace a bit shift by a use of BIT.

Hi Arushi,

Thank you for the patch.

On Friday 24 Mar 2017 21:31:45 Arushi Singhal wrote:
> This patch replaces bit shifting on 1 with the BIT(x) macro.
> This was done with coccinelle:
> @@
> constant c;
> @@
>
> -1 << c
> +BIT(c)
>
> Signed-off-by: Arushi Singhal <[email protected]>

Acked-by: Laurent Pinchart <[email protected]>

Greg, as this is a staging driver, do you want to merge the patch through your
tree ?

> ---
> changes in v2
> -Remove unnecessary parenthesis
>
> drivers/staging/media/omap4iss/iss_csi2.c | 2 +-
> drivers/staging/media/omap4iss/iss_ipipe.c | 2 +-
> drivers/staging/media/omap4iss/iss_ipipeif.c | 2 +-
> drivers/staging/media/omap4iss/iss_resizer.c | 2 +-
> 4 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/media/omap4iss/iss_csi2.c
> b/drivers/staging/media/omap4iss/iss_csi2.c index
> f71d5f2f179f..f6acc541e8a2 100644
> --- a/drivers/staging/media/omap4iss/iss_csi2.c
> +++ b/drivers/staging/media/omap4iss/iss_csi2.c
> @@ -1268,7 +1268,7 @@ static int csi2_init_entities(struct iss_csi2_device
> *csi2, const char *subname) snprintf(name, sizeof(name), "CSI2%s",
> subname);
> snprintf(sd->name, sizeof(sd->name), "OMAP4 ISS %s", name);
>
> - sd->grp_id = 1 << 16; /* group ID for iss subdevs */
> + sd->grp_id = BIT(16); /* group ID for iss subdevs */
> v4l2_set_subdevdata(sd, csi2);
> sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
>
> diff --git a/drivers/staging/media/omap4iss/iss_ipipe.c
> b/drivers/staging/media/omap4iss/iss_ipipe.c index
> d38782e8e84c..d86ef8a031f2 100644
> --- a/drivers/staging/media/omap4iss/iss_ipipe.c
> +++ b/drivers/staging/media/omap4iss/iss_ipipe.c
> @@ -508,7 +508,7 @@ static int ipipe_init_entities(struct iss_ipipe_device
> *ipipe) v4l2_subdev_init(sd, &ipipe_v4l2_ops);
> sd->internal_ops = &ipipe_v4l2_internal_ops;
> strlcpy(sd->name, "OMAP4 ISS ISP IPIPE", sizeof(sd->name));
> - sd->grp_id = 1 << 16; /* group ID for iss subdevs */
> + sd->grp_id = BIT(16); /* group ID for iss subdevs */
> v4l2_set_subdevdata(sd, ipipe);
> sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
>
> diff --git a/drivers/staging/media/omap4iss/iss_ipipeif.c
> b/drivers/staging/media/omap4iss/iss_ipipeif.c index
> 23de8330731d..cb88b2bd0d82 100644
> --- a/drivers/staging/media/omap4iss/iss_ipipeif.c
> +++ b/drivers/staging/media/omap4iss/iss_ipipeif.c
> @@ -739,7 +739,7 @@ static int ipipeif_init_entities(struct
> iss_ipipeif_device *ipipeif) v4l2_subdev_init(sd, &ipipeif_v4l2_ops);
> sd->internal_ops = &ipipeif_v4l2_internal_ops;
> strlcpy(sd->name, "OMAP4 ISS ISP IPIPEIF", sizeof(sd->name));
> - sd->grp_id = 1 << 16; /* group ID for iss subdevs */
> + sd->grp_id = BIT(16); /* group ID for iss subdevs */
> v4l2_set_subdevdata(sd, ipipeif);
> sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
>
> diff --git a/drivers/staging/media/omap4iss/iss_resizer.c
> b/drivers/staging/media/omap4iss/iss_resizer.c index
> f1d352c711d5..4bbfa20b3c38 100644
> --- a/drivers/staging/media/omap4iss/iss_resizer.c
> +++ b/drivers/staging/media/omap4iss/iss_resizer.c
> @@ -782,7 +782,7 @@ static int resizer_init_entities(struct
> iss_resizer_device *resizer) v4l2_subdev_init(sd, &resizer_v4l2_ops);
> sd->internal_ops = &resizer_v4l2_internal_ops;
> strlcpy(sd->name, "OMAP4 ISS ISP resizer", sizeof(sd->name));
> - sd->grp_id = 1 << 16; /* group ID for iss subdevs */
> + sd->grp_id = BIT(16); /* group ID for iss subdevs */
> v4l2_set_subdevdata(sd, resizer);
> sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;

--
Regards,

Laurent Pinchart

2017-03-26 18:24:59

by Mauro Carvalho Chehab

Subject: Re: [PATCH v2] staging: media: omap4iss: Replace a bit shift by a use of BIT.

Em Sun, 26 Mar 2017 20:57:02 +0300
Laurent Pinchart <[email protected]> escreveu:

> Hi Arushi,
>
> Thank you for the patch.
>
> On Friday 24 Mar 2017 21:31:45 Arushi Singhal wrote:
> > This patch replaces bit shifting on 1 with the BIT(x) macro.
> > This was done with coccinelle:
> > @@
> > constant c;
> > @@
> >
> > -1 << c
> > +BIT(c)
> >
> > Signed-off-by: Arushi Singhal <[email protected]>
>
> Acked-by: Laurent Pinchart <[email protected]>
>
> Greg, as this is a staging driver, do you want to merge the patch through your
> tree ?

As this is at staging/media, better to merge via my tree.

Regards,
Mauro

>
> > ---
> > changes in v2
> > -Remove unnecessary parenthesis
> >
> > drivers/staging/media/omap4iss/iss_csi2.c | 2 +-
> > drivers/staging/media/omap4iss/iss_ipipe.c | 2 +-
> > drivers/staging/media/omap4iss/iss_ipipeif.c | 2 +-
> > drivers/staging/media/omap4iss/iss_resizer.c | 2 +-
> > 4 files changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/staging/media/omap4iss/iss_csi2.c
> > b/drivers/staging/media/omap4iss/iss_csi2.c index
> > f71d5f2f179f..f6acc541e8a2 100644
> > --- a/drivers/staging/media/omap4iss/iss_csi2.c
> > +++ b/drivers/staging/media/omap4iss/iss_csi2.c
> > @@ -1268,7 +1268,7 @@ static int csi2_init_entities(struct iss_csi2_device
> > *csi2, const char *subname) snprintf(name, sizeof(name), "CSI2%s",
> > subname);
> > snprintf(sd->name, sizeof(sd->name), "OMAP4 ISS %s", name);
> >
> > - sd->grp_id = 1 << 16; /* group ID for iss subdevs */
> > + sd->grp_id = BIT(16); /* group ID for iss subdevs */
> > v4l2_set_subdevdata(sd, csi2);
> > sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
> >
> > diff --git a/drivers/staging/media/omap4iss/iss_ipipe.c
> > b/drivers/staging/media/omap4iss/iss_ipipe.c index
> > d38782e8e84c..d86ef8a031f2 100644
> > --- a/drivers/staging/media/omap4iss/iss_ipipe.c
> > +++ b/drivers/staging/media/omap4iss/iss_ipipe.c
> > @@ -508,7 +508,7 @@ static int ipipe_init_entities(struct iss_ipipe_device
> > *ipipe) v4l2_subdev_init(sd, &ipipe_v4l2_ops);
> > sd->internal_ops = &ipipe_v4l2_internal_ops;
> > strlcpy(sd->name, "OMAP4 ISS ISP IPIPE", sizeof(sd->name));
> > - sd->grp_id = 1 << 16; /* group ID for iss subdevs */
> > + sd->grp_id = BIT(16); /* group ID for iss subdevs */
> > v4l2_set_subdevdata(sd, ipipe);
> > sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
> >
> > diff --git a/drivers/staging/media/omap4iss/iss_ipipeif.c
> > b/drivers/staging/media/omap4iss/iss_ipipeif.c index
> > 23de8330731d..cb88b2bd0d82 100644
> > --- a/drivers/staging/media/omap4iss/iss_ipipeif.c
> > +++ b/drivers/staging/media/omap4iss/iss_ipipeif.c
> > @@ -739,7 +739,7 @@ static int ipipeif_init_entities(struct
> > iss_ipipeif_device *ipipeif) v4l2_subdev_init(sd, &ipipeif_v4l2_ops);
> > sd->internal_ops = &ipipeif_v4l2_internal_ops;
> > strlcpy(sd->name, "OMAP4 ISS ISP IPIPEIF", sizeof(sd->name));
> > - sd->grp_id = 1 << 16; /* group ID for iss subdevs */
> > + sd->grp_id = BIT(16); /* group ID for iss subdevs */
> > v4l2_set_subdevdata(sd, ipipeif);
> > sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
> >
> > diff --git a/drivers/staging/media/omap4iss/iss_resizer.c
> > b/drivers/staging/media/omap4iss/iss_resizer.c index
> > f1d352c711d5..4bbfa20b3c38 100644
> > --- a/drivers/staging/media/omap4iss/iss_resizer.c
> > +++ b/drivers/staging/media/omap4iss/iss_resizer.c
> > @@ -782,7 +782,7 @@ static int resizer_init_entities(struct
> > iss_resizer_device *resizer) v4l2_subdev_init(sd, &resizer_v4l2_ops);
> > sd->internal_ops = &resizer_v4l2_internal_ops;
> > strlcpy(sd->name, "OMAP4 ISS ISP resizer", sizeof(sd->name));
> > - sd->grp_id = 1 << 16; /* group ID for iss subdevs */
> > + sd->grp_id = BIT(16); /* group ID for iss subdevs */
> > v4l2_set_subdevdata(sd, resizer);
> > sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
>



Thanks,
Mauro