67 lines
2.1 KiB
Diff
67 lines
2.1 KiB
Diff
|
|
From f06b930da5d2acf70d142f1212ef4ee09d643b21 Mon Sep 17 00:00:00 2001
|
||
|
|
From: dinglimin <dinglimin@cmss.chinamobile.com>
|
||
|
|
Date: Tue, 27 Feb 2024 16:18:43 +0800
|
||
|
|
Subject: [PATCH] hw/usb: Style cleanup
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
cheery-pick from 455177ffc457098b0103d2a09cb7ba5e260dfcdd
|
||
|
|
|
||
|
|
We are going to modify these lines, fix their style
|
||
|
|
in order to avoid checkpatch.pl warning.
|
||
|
|
|
||
|
|
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
||
|
|
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
|
||
|
|
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
|
||
|
|
Signed-off-by: dinglimin <dinglimin@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
hw/usb/hcd-ehci.c | 3 ++-
|
||
|
|
hw/usb/hcd-uhci.c | 6 ++++--
|
||
|
|
2 files changed, 6 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
|
||
|
|
index 19b4534c20..7b093acd98 100644
|
||
|
|
--- a/hw/usb/hcd-ehci.c
|
||
|
|
+++ b/hw/usb/hcd-ehci.c
|
||
|
|
@@ -1086,8 +1086,9 @@ static void ehci_opreg_write(void *ptr, hwaddr addr,
|
||
|
|
case CONFIGFLAG:
|
||
|
|
val &= 0x1;
|
||
|
|
if (val) {
|
||
|
|
- for(i = 0; i < NB_PORTS; i++)
|
||
|
|
+ for (i = 0; i < NB_PORTS; i++) {
|
||
|
|
handle_port_owner_write(s, i, 0);
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
break;
|
||
|
|
|
||
|
|
diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c
|
||
|
|
index 77baaa7a6b..6975966c3f 100644
|
||
|
|
--- a/hw/usb/hcd-uhci.c
|
||
|
|
+++ b/hw/usb/hcd-uhci.c
|
||
|
|
@@ -457,8 +457,9 @@ static void uhci_port_write(void *opaque, hwaddr addr,
|
||
|
|
int n;
|
||
|
|
|
||
|
|
n = (addr >> 1) & 7;
|
||
|
|
- if (n >= NB_PORTS)
|
||
|
|
+ if (n >= NB_PORTS) {
|
||
|
|
return;
|
||
|
|
+ }
|
||
|
|
port = &s->ports[n];
|
||
|
|
dev = port->port.dev;
|
||
|
|
if (dev && dev->attached) {
|
||
|
|
@@ -513,8 +514,9 @@ static uint64_t uhci_port_read(void *opaque, hwaddr addr, unsigned size)
|
||
|
|
UHCIPort *port;
|
||
|
|
int n;
|
||
|
|
n = (addr >> 1) & 7;
|
||
|
|
- if (n >= NB_PORTS)
|
||
|
|
+ if (n >= NB_PORTS) {
|
||
|
|
goto read_default;
|
||
|
|
+ }
|
||
|
|
port = &s->ports[n];
|
||
|
|
val = port->ctrl;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|