2021-05-27 12:11:48

by Kyle Tso

Subject: [PATCH v2] dt-bindings: connector: Replace BIT macro with generic bit ops

BIT macro is not defined. Replace it with generic bit operations.

Fixes: 630dce2810b9 ("dt-bindings: connector: Add SVDM VDO properties")
Signed-off-by: Kyle Tso <[email protected]>
---
Changes since v1:
- re-word the commit message

include/dt-bindings/usb/pd.h | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/dt-bindings/usb/pd.h b/include/dt-bindings/usb/pd.h
index fef3ef65967f..cb70b4ceedde 100644
--- a/include/dt-bindings/usb/pd.h
+++ b/include/dt-bindings/usb/pd.h
@@ -163,10 +163,10 @@
#define UFP_VDO_VER1_2 2

/* Device Capability */
-#define DEV_USB2_CAPABLE BIT(0)
-#define DEV_USB2_BILLBOARD BIT(1)
-#define DEV_USB3_CAPABLE BIT(2)
-#define DEV_USB4_CAPABLE BIT(3)
+#define DEV_USB2_CAPABLE (1 << 0)
+#define DEV_USB2_BILLBOARD (1 << 1)
+#define DEV_USB3_CAPABLE (1 << 2)
+#define DEV_USB4_CAPABLE (1 << 3)

/* Connector Type */
#define UFP_RECEPTACLE 2
@@ -191,9 +191,9 @@

/* Alternate Modes */
#define UFP_ALTMODE_NOT_SUPP 0
-#define UFP_ALTMODE_TBT3 BIT(0)
-#define UFP_ALTMODE_RECFG BIT(1)
-#define UFP_ALTMODE_NO_RECFG BIT(2)
+#define UFP_ALTMODE_TBT3 (1 << 0)
+#define UFP_ALTMODE_RECFG (1 << 1)
+#define UFP_ALTMODE_NO_RECFG (1 << 2)

/* USB Highest Speed */
#define UFP_USB2_ONLY 0
@@ -217,9 +217,9 @@
* <4:0> :: Port number
*/
#define DFP_VDO_VER1_1 1
-#define HOST_USB2_CAPABLE BIT(0)
-#define HOST_USB3_CAPABLE BIT(1)
-#define HOST_USB4_CAPABLE BIT(2)
+#define HOST_USB2_CAPABLE (1 << 0)
+#define HOST_USB3_CAPABLE (1 << 1)
+#define HOST_USB4_CAPABLE (1 << 2)
#define DFP_RECEPTACLE 2
#define DFP_CAPTIVE 3

--
2.31.1.818.g46aad6cb9e-goog

2021-05-27 12:54:03

by Rob Herring

Subject: Re: [PATCH v2] dt-bindings: connector: Replace BIT macro with generic bit ops

On Thu, May 27, 2021 at 7:41 AM Greg KH <[email protected]> wrote:
>
> On Thu, May 27, 2021 at 08:10:29PM +0800, Kyle Tso wrote:
> > BIT macro is not defined. Replace it with generic bit operations.
> >
> > Fixes: 630dce2810b9 ("dt-bindings: connector: Add SVDM VDO properties")
> > Signed-off-by: Kyle Tso <[email protected]>
> > ---
> > Changes since v1:
> > - re-word the commit message
> >
> > include/dt-bindings/usb/pd.h | 20 ++++++++++----------
> > 1 file changed, 10 insertions(+), 10 deletions(-)
> >
> > diff --git a/include/dt-bindings/usb/pd.h b/include/dt-bindings/usb/pd.h
> > index fef3ef65967f..cb70b4ceedde 100644
> > --- a/include/dt-bindings/usb/pd.h
> > +++ b/include/dt-bindings/usb/pd.h
> > @@ -163,10 +163,10 @@
> > #define UFP_VDO_VER1_2 2
> >
> > /* Device Capability */
> > -#define DEV_USB2_CAPABLE BIT(0)
> > -#define DEV_USB2_BILLBOARD BIT(1)
> > -#define DEV_USB3_CAPABLE BIT(2)
> > -#define DEV_USB4_CAPABLE BIT(3)
> > +#define DEV_USB2_CAPABLE (1 << 0)
> > +#define DEV_USB2_BILLBOARD (1 << 1)
> > +#define DEV_USB3_CAPABLE (1 << 2)
> > +#define DEV_USB4_CAPABLE (1 << 3)
>
> Why not just include the proper .h file instead?

Because the DT headers can't depend on kernel headers as they get used
separately.

Rob

2021-05-27 13:04:58

by Greg Kroah-Hartman

Subject: Re: [PATCH v2] dt-bindings: connector: Replace BIT macro with generic bit ops

On Thu, May 27, 2021 at 07:52:24AM -0500, Rob Herring wrote:
> On Thu, May 27, 2021 at 7:41 AM Greg KH <[email protected]> wrote:
> >
> > On Thu, May 27, 2021 at 08:10:29PM +0800, Kyle Tso wrote:
> > > BIT macro is not defined. Replace it with generic bit operations.
> > >
> > > Fixes: 630dce2810b9 ("dt-bindings: connector: Add SVDM VDO properties")
> > > Signed-off-by: Kyle Tso <[email protected]>
> > > ---
> > > Changes since v1:
> > > - re-word the commit message
> > >
> > > include/dt-bindings/usb/pd.h | 20 ++++++++++----------
> > > 1 file changed, 10 insertions(+), 10 deletions(-)
> > >
> > > diff --git a/include/dt-bindings/usb/pd.h b/include/dt-bindings/usb/pd.h
> > > index fef3ef65967f..cb70b4ceedde 100644
> > > --- a/include/dt-bindings/usb/pd.h
> > > +++ b/include/dt-bindings/usb/pd.h
> > > @@ -163,10 +163,10 @@
> > > #define UFP_VDO_VER1_2 2
> > >
> > > /* Device Capability */
> > > -#define DEV_USB2_CAPABLE BIT(0)
> > > -#define DEV_USB2_BILLBOARD BIT(1)
> > > -#define DEV_USB3_CAPABLE BIT(2)
> > > -#define DEV_USB4_CAPABLE BIT(3)
> > > +#define DEV_USB2_CAPABLE (1 << 0)
> > > +#define DEV_USB2_BILLBOARD (1 << 1)
> > > +#define DEV_USB3_CAPABLE (1 << 2)
> > > +#define DEV_USB4_CAPABLE (1 << 3)
> >
> > Why not just include the proper .h file instead?
>
> Because the DT headers can't depend on kernel headers as they get used
> separately.

Lame. :)

2021-05-27 16:08:59

by Greg Kroah-Hartman

Subject: Re: [PATCH v2] dt-bindings: connector: Replace BIT macro with generic bit ops

On Thu, May 27, 2021 at 08:10:29PM +0800, Kyle Tso wrote:
> BIT macro is not defined. Replace it with generic bit operations.
>
> Fixes: 630dce2810b9 ("dt-bindings: connector: Add SVDM VDO properties")
> Signed-off-by: Kyle Tso <[email protected]>
> ---
> Changes since v1:
> - re-word the commit message
>
> include/dt-bindings/usb/pd.h | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/include/dt-bindings/usb/pd.h b/include/dt-bindings/usb/pd.h
> index fef3ef65967f..cb70b4ceedde 100644
> --- a/include/dt-bindings/usb/pd.h
> +++ b/include/dt-bindings/usb/pd.h
> @@ -163,10 +163,10 @@
> #define UFP_VDO_VER1_2 2
>
> /* Device Capability */
> -#define DEV_USB2_CAPABLE BIT(0)
> -#define DEV_USB2_BILLBOARD BIT(1)
> -#define DEV_USB3_CAPABLE BIT(2)
> -#define DEV_USB4_CAPABLE BIT(3)
> +#define DEV_USB2_CAPABLE (1 << 0)
> +#define DEV_USB2_BILLBOARD (1 << 1)
> +#define DEV_USB3_CAPABLE (1 << 2)
> +#define DEV_USB4_CAPABLE (1 << 3)

Why not just include the proper .h file instead?

2021-06-02 20:22:25

by Rob Herring

Subject: Re: [PATCH v2] dt-bindings: connector: Replace BIT macro with generic bit ops

On Thu, 27 May 2021 20:10:29 +0800, Kyle Tso wrote:
> BIT macro is not defined. Replace it with generic bit operations.
>
> Fixes: 630dce2810b9 ("dt-bindings: connector: Add SVDM VDO properties")
> Signed-off-by: Kyle Tso <[email protected]>
> ---
> Changes since v1:
> - re-word the commit message
>
> include/dt-bindings/usb/pd.h | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>

Reviewed-by: Rob Herring <[email protected]>