From: Niklas Neronin Date: Wed, 19 Nov 2025 14:24:15 +0000 (+0200) Subject: usb: xhci: drop xhci-caps.h dependence on xhci-ext-caps.h X-Git-Tag: v6.19-rc1~63^2~40 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2282ab38d87e63010195be5569a751448724d14b;p=thirdparty%2Fkernel%2Flinux.git usb: xhci: drop xhci-caps.h dependence on xhci-ext-caps.h Drop the dependency of xhci-caps.h on xhci-ext-caps.h by eliminating 2 instances where macros in xhci-caps.h were redefined from xhci-ext-caps.h. Signed-off-by: Niklas Neronin Signed-off-by: Mathias Nyman Link: https://patch.msgid.link/20251119142417.2820519-22-mathias.nyman@linux.intel.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/host/xhci-caps.h b/drivers/usb/host/xhci-caps.h index af47aebc5ba83..99557df89f883 100644 --- a/drivers/usb/host/xhci-caps.h +++ b/drivers/usb/host/xhci-caps.h @@ -6,7 +6,7 @@ /* hc_capbase - bitmasks */ /* bits 7:0 - Capability Registers Length */ -#define HC_LENGTH(p) XHCI_HC_LENGTH(p) +#define HC_LENGTH(p) ((p) & 0xff) /* bits 15:8 - Rsvd */ /* bits 31:16 - Host Controller Interface Version Number */ #define HC_VERSION(p) (((p) >> 16) & 0xffff) @@ -77,7 +77,7 @@ /* bits 15:12 - Max size for Primary Stream Arrays, 2^(n+1) */ #define HCC_MAX_PSA(p) (1 << ((((p) >> 12) & 0xf) + 1)) /* bits 31:16 - xHCI Extended Capabilities Pointer, from PCI base: 2^(n) */ -#define HCC_EXT_CAPS(p) XHCI_HCC_EXT_CAPS(p) +#define HCC_EXT_CAPS(p) (((p) >> 16) & 0xffff) /* DBOFF - db_off - bitmasks */ /* bits 1:0 - Rsvd */