Message ID | 20200628203748.14250-2-peter.maydell@linaro.org |
---|---|
State | Superseded |
Headers | show |
Series | tosa: fix Coverity CID 1421929 | expand |
On 6/28/20 10:37 PM, Peter Maydell wrote: > Remove the hardcoded tabs from hw/arm/tosa.c. There aren't > many, but since they're all in constant #defines they're not > going to go away with our usual "only when we touch a function" > policy on reformatting. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> No change using 'git-diff -w'. Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/arm/tosa.c | 44 ++++++++++++++++++++++---------------------- > 1 file changed, 22 insertions(+), 22 deletions(-) > > diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c > index 5dee2d76c61..06ecf1e7824 100644 > --- a/hw/arm/tosa.c > +++ b/hw/arm/tosa.c > @@ -26,32 +26,32 @@ > #include "hw/sysbus.h" > #include "exec/address-spaces.h" > > -#define TOSA_RAM 0x04000000 > -#define TOSA_ROM 0x00800000 > +#define TOSA_RAM 0x04000000 > +#define TOSA_ROM 0x00800000 > > -#define TOSA_GPIO_USB_IN (5) > -#define TOSA_GPIO_nSD_DETECT (9) > -#define TOSA_GPIO_ON_RESET (19) > -#define TOSA_GPIO_CF_IRQ (21) /* CF slot0 Ready */ > -#define TOSA_GPIO_CF_CD (13) > -#define TOSA_GPIO_TC6393XB_INT (15) > -#define TOSA_GPIO_JC_CF_IRQ (36) /* CF slot1 Ready */ > +#define TOSA_GPIO_USB_IN (5) > +#define TOSA_GPIO_nSD_DETECT (9) > +#define TOSA_GPIO_ON_RESET (19) > +#define TOSA_GPIO_CF_IRQ (21) /* CF slot0 Ready */ > +#define TOSA_GPIO_CF_CD (13) > +#define TOSA_GPIO_TC6393XB_INT (15) > +#define TOSA_GPIO_JC_CF_IRQ (36) /* CF slot1 Ready */ > > -#define TOSA_SCOOP_GPIO_BASE 1 > -#define TOSA_GPIO_IR_POWERDWN (TOSA_SCOOP_GPIO_BASE + 2) > -#define TOSA_GPIO_SD_WP (TOSA_SCOOP_GPIO_BASE + 3) > -#define TOSA_GPIO_PWR_ON (TOSA_SCOOP_GPIO_BASE + 4) > +#define TOSA_SCOOP_GPIO_BASE 1 > +#define TOSA_GPIO_IR_POWERDWN (TOSA_SCOOP_GPIO_BASE + 2) > +#define TOSA_GPIO_SD_WP (TOSA_SCOOP_GPIO_BASE + 3) > +#define TOSA_GPIO_PWR_ON (TOSA_SCOOP_GPIO_BASE + 4) > > -#define TOSA_SCOOP_JC_GPIO_BASE 1 > -#define TOSA_GPIO_BT_LED (TOSA_SCOOP_JC_GPIO_BASE + 0) > -#define TOSA_GPIO_NOTE_LED (TOSA_SCOOP_JC_GPIO_BASE + 1) > -#define TOSA_GPIO_CHRG_ERR_LED (TOSA_SCOOP_JC_GPIO_BASE + 2) > -#define TOSA_GPIO_TC6393XB_L3V_ON (TOSA_SCOOP_JC_GPIO_BASE + 5) > -#define TOSA_GPIO_WLAN_LED (TOSA_SCOOP_JC_GPIO_BASE + 7) > +#define TOSA_SCOOP_JC_GPIO_BASE 1 > +#define TOSA_GPIO_BT_LED (TOSA_SCOOP_JC_GPIO_BASE + 0) > +#define TOSA_GPIO_NOTE_LED (TOSA_SCOOP_JC_GPIO_BASE + 1) > +#define TOSA_GPIO_CHRG_ERR_LED (TOSA_SCOOP_JC_GPIO_BASE + 2) > +#define TOSA_GPIO_TC6393XB_L3V_ON (TOSA_SCOOP_JC_GPIO_BASE + 5) > +#define TOSA_GPIO_WLAN_LED (TOSA_SCOOP_JC_GPIO_BASE + 7) > > -#define DAC_BASE 0x4e > -#define DAC_CH1 0 > -#define DAC_CH2 1 > +#define DAC_BASE 0x4e > +#define DAC_CH1 0 > +#define DAC_CH2 1 > > static void tosa_microdrive_attach(PXA2xxState *cpu) > { >
diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c index 5dee2d76c61..06ecf1e7824 100644 --- a/hw/arm/tosa.c +++ b/hw/arm/tosa.c @@ -26,32 +26,32 @@ #include "hw/sysbus.h" #include "exec/address-spaces.h" -#define TOSA_RAM 0x04000000 -#define TOSA_ROM 0x00800000 +#define TOSA_RAM 0x04000000 +#define TOSA_ROM 0x00800000 -#define TOSA_GPIO_USB_IN (5) -#define TOSA_GPIO_nSD_DETECT (9) -#define TOSA_GPIO_ON_RESET (19) -#define TOSA_GPIO_CF_IRQ (21) /* CF slot0 Ready */ -#define TOSA_GPIO_CF_CD (13) -#define TOSA_GPIO_TC6393XB_INT (15) -#define TOSA_GPIO_JC_CF_IRQ (36) /* CF slot1 Ready */ +#define TOSA_GPIO_USB_IN (5) +#define TOSA_GPIO_nSD_DETECT (9) +#define TOSA_GPIO_ON_RESET (19) +#define TOSA_GPIO_CF_IRQ (21) /* CF slot0 Ready */ +#define TOSA_GPIO_CF_CD (13) +#define TOSA_GPIO_TC6393XB_INT (15) +#define TOSA_GPIO_JC_CF_IRQ (36) /* CF slot1 Ready */ -#define TOSA_SCOOP_GPIO_BASE 1 -#define TOSA_GPIO_IR_POWERDWN (TOSA_SCOOP_GPIO_BASE + 2) -#define TOSA_GPIO_SD_WP (TOSA_SCOOP_GPIO_BASE + 3) -#define TOSA_GPIO_PWR_ON (TOSA_SCOOP_GPIO_BASE + 4) +#define TOSA_SCOOP_GPIO_BASE 1 +#define TOSA_GPIO_IR_POWERDWN (TOSA_SCOOP_GPIO_BASE + 2) +#define TOSA_GPIO_SD_WP (TOSA_SCOOP_GPIO_BASE + 3) +#define TOSA_GPIO_PWR_ON (TOSA_SCOOP_GPIO_BASE + 4) -#define TOSA_SCOOP_JC_GPIO_BASE 1 -#define TOSA_GPIO_BT_LED (TOSA_SCOOP_JC_GPIO_BASE + 0) -#define TOSA_GPIO_NOTE_LED (TOSA_SCOOP_JC_GPIO_BASE + 1) -#define TOSA_GPIO_CHRG_ERR_LED (TOSA_SCOOP_JC_GPIO_BASE + 2) -#define TOSA_GPIO_TC6393XB_L3V_ON (TOSA_SCOOP_JC_GPIO_BASE + 5) -#define TOSA_GPIO_WLAN_LED (TOSA_SCOOP_JC_GPIO_BASE + 7) +#define TOSA_SCOOP_JC_GPIO_BASE 1 +#define TOSA_GPIO_BT_LED (TOSA_SCOOP_JC_GPIO_BASE + 0) +#define TOSA_GPIO_NOTE_LED (TOSA_SCOOP_JC_GPIO_BASE + 1) +#define TOSA_GPIO_CHRG_ERR_LED (TOSA_SCOOP_JC_GPIO_BASE + 2) +#define TOSA_GPIO_TC6393XB_L3V_ON (TOSA_SCOOP_JC_GPIO_BASE + 5) +#define TOSA_GPIO_WLAN_LED (TOSA_SCOOP_JC_GPIO_BASE + 7) -#define DAC_BASE 0x4e -#define DAC_CH1 0 -#define DAC_CH2 1 +#define DAC_BASE 0x4e +#define DAC_CH1 0 +#define DAC_CH2 1 static void tosa_microdrive_attach(PXA2xxState *cpu) {
Remove the hardcoded tabs from hw/arm/tosa.c. There aren't many, but since they're all in constant #defines they're not going to go away with our usual "only when we touch a function" policy on reformatting. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- hw/arm/tosa.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) -- 2.20.1