Re: [PATCH v4 4/4] hw/usb: fix tab indentation

[Thomas Huth]

On 02/11/2022 07.51, Thomas Huth wrote:
> On 31/10/2022 20.10, Amarjargal Gundjalam wrote:
> > On 26/10/22 00:22, Thomas Huth wrote:
> > > On 25/10/2022 16.28, Amarjargal Gundjalam wrote:
> > > > The TABs should be replaced with spaces, to make sure that we have a
> > > > consistent coding style with an indentation of 4 spaces everywhere.
> > > >
> > > > Resolves: https://gitlab.com/qemu-project/qemu/-/issues/370
> > > > Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
> > > >
> > > > Signed-off-by: Amarjargal Gundjalam <amarjargal16@gmail.com>
> > > > ---
> > > >   hw/usb/dev-hub.c           |   82 +-
> > > >   hw/usb/dev-network.c       |  286 +++----
> > > >   hw/usb/dev-wacom.c         |    4 +-
> > > >   hw/usb/hcd-musb.c          |  328 ++++----
> > > >   hw/usb/quirks-pl2303-ids.h |  180 ++--
> > > >   include/hw/usb.h           |  100 +--
> > > >   include/hw/usb/dwc2-regs.h | 1608 ++++++++++++++++++------------------
> > > >   7 files changed, 1294 insertions(+), 1294 deletions(-)
> ...
> > > >   diff --git a/hw/usb/dev-wacom.c b/hw/usb/dev-wacom.c
> > > > index 8323650c6a..7177c17f03 100644
> > > > --- a/hw/usb/dev-wacom.c
> > > > +++ b/hw/usb/dev-wacom.c
> > > > @@ -36,8 +36,8 @@
> > > >   #include "qom/object.h"
> > > >     /* Interface requests */
> > > > -#define WACOM_GET_REPORT    0x2101
> > > > -#define WACOM_SET_REPORT    0x2109
> > > > +#define WACOM_GET_REPORT    0x2101
> > > > +#define WACOM_SET_REPORT    0x2109
> > > >     struct USBWacomState {
> > > >       USBDevice dev;
> > > > diff --git a/hw/usb/hcd-musb.c b/hw/usb/hcd-musb.c
> > > > index 85f5ff5bd4..6929b026b1 100644
> > > > --- a/hw/usb/hcd-musb.c
> > > > +++ b/hw/usb/hcd-musb.c
> > > > @@ -28,227 +28,227 @@
> > > >   #include "hw/hw.h"
> > > >     /* Common USB registers */
> > > > -#define MUSB_HDRC_FADDR        0x00    /* 8-bit */
> > > > -#define MUSB_HDRC_POWER        0x01    /* 8-bit */
> > > > -
> > > > -#define MUSB_HDRC_INTRTX    0x02    /* 16-bit */
> > > > -#define MUSB_HDRC_INTRRX    0x04
> > > > -#define MUSB_HDRC_INTRTXE    0x06
> > > > -#define MUSB_HDRC_INTRRXE    0x08
> > > > -#define MUSB_HDRC_INTRUSB    0x0a    /* 8 bit */
> > > > -#define MUSB_HDRC_INTRUSBE    0x0b    /* 8 bit */
> > > > -#define MUSB_HDRC_FRAME        0x0c    /* 16-bit */
> > > > -#define MUSB_HDRC_INDEX        0x0e    /* 8 bit */
> > > > -#define MUSB_HDRC_TESTMODE    0x0f    /* 8 bit */
> > > > +#define MUSB_HDRC_FADDR         0x00    /* 8-bit */
> > > > +#define MUSB_HDRC_POWER         0x01    /* 8-bit */
> > > > +
> > > > +#define MUSB_HDRC_INTRTX        0x02    /* 16-bit */
> > > > +#define MUSB_HDRC_INTRRX        0x04
> > > > +#define MUSB_HDRC_INTRTXE       0x06
> > >
> > > Sorry for not noticing it earlier, and the problem is pre-existing and 
> > > not related to your patches, but in case you respinning again, my git is 
> > > complaining here about the spaces at the end of the line:
> > >
> > > .git/rebase-apply/patch:524: trailing whitespace.
> > > #define MUSB_HDRC_INTRTXE       0x06
> > >
> > > (maybe this could also be fixed by the maintainer when picking up the patch)
> ...
> > >
> > Should I fix them and submit a new version?
>
> No, let's wait for the maintainer (Gerd) first to decide whether this should 
> be fixed in this patch or not.

Seems like Gerd is currently away from keyboard, so I dared to pick up patch 
1, 3 and 4 for my current pull request (and fixed the white spaces at the 
line endings in patch 4). For patch 2, I think I'd prefer to wait for Gerd's 
feedback first what to do best with the fmopl.c file.

 Thomas