[PATCH 11/11] PCI: Move CardBus resource names to setup-cardbus.c
From: Ilpo Järvinen
Date: Mon Nov 09 2026 - 16:11:29 EST
pci_resource_name() contains a table of resource names specific to
CardBus bridges. Move the CardBus-specific part into
pci_cardbus_resource_name() in setup-cardbus.c to make the core code
cleaner.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxxxxxx>
---
drivers/pci/pci.c | 26 ++------------------------
drivers/pci/pci.h | 5 +++++
drivers/pci/setup-cardbus.c | 30 ++++++++++++++++++++++++++++++
3 files changed, 37 insertions(+), 24 deletions(-)
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 46da873c9aac..e6c5a2d28abf 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -832,31 +832,9 @@ const char *pci_resource_name(struct pci_dev *dev, unsigned int i)
"bridge window", /* "mem" included in %pR */
"bridge window", /* "mem pref" included in %pR */
};
- static const char * const cardbus_name[] = {
- "BAR 1",
- "unknown",
- "unknown",
- "unknown",
- "unknown",
- "unknown",
- "unknown",
-#ifdef CONFIG_PCI_IOV
- "unknown",
- "unknown",
- "unknown",
- "unknown",
- "unknown",
- "unknown",
-#endif
- "CardBus bridge window 0", /* I/O */
- "CardBus bridge window 1", /* I/O */
- "CardBus bridge window 0", /* mem */
- "CardBus bridge window 1", /* mem */
- };
- if (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS &&
- i < ARRAY_SIZE(cardbus_name))
- return cardbus_name[i];
+ if (pci_is_cardbus_bridge(dev))
+ return pci_cardbus_resource_name(i);
if (i < ARRAY_SIZE(bar_name))
return bar_name[i];
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 057c8a2c7ee7..eefa5a2937c1 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -426,6 +426,7 @@ static inline bool pci_is_cardbus_bridge(const struct pci_dev *dev)
#ifdef CONFIG_CARDBUS
unsigned long pci_cardbus_resource_alignment(const struct resource *res);
int pci_setup_cardbus_device(struct pci_dev *dev);
+const char *pci_cardbus_resource_name(unsigned int resno);
int pci_bus_size_cardbus_bridge(struct pci_bus *bus,
struct list_head *realloc_head);
int pci_cardbus_scan_bridge_extend(struct pci_bus *bus, struct pci_dev *dev,
@@ -442,6 +443,10 @@ static inline int pci_setup_cardbus_device(struct pci_dev *dev)
{
return -EOPNOTSUPP;
}
+static inline const char *pci_cardbus_resource_name(unsigned int resno)
+{
+ return "unsupported";
+}
static inline int pci_bus_size_cardbus_bridge(struct pci_bus *bus,
struct list_head *realloc_head)
{
diff --git a/drivers/pci/setup-cardbus.c b/drivers/pci/setup-cardbus.c
index 33aca7b28354..9acbf299c3a3 100644
--- a/drivers/pci/setup-cardbus.c
+++ b/drivers/pci/setup-cardbus.c
@@ -44,6 +44,36 @@ int pci_setup_cardbus_device(struct pci_dev *dev)
return 0;
}
+const char *pci_cardbus_resource_name(unsigned int resno)
+{
+ static const char * const cardbus_name[] = {
+ "BAR 1",
+ "unknown",
+ "unknown",
+ "unknown",
+ "unknown",
+ "unknown",
+ "unknown",
+#ifdef CONFIG_PCI_IOV
+ "unknown",
+ "unknown",
+ "unknown",
+ "unknown",
+ "unknown",
+ "unknown",
+#endif
+ "CardBus bridge window 0", /* I/O */
+ "CardBus bridge window 1", /* I/O */
+ "CardBus bridge window 0", /* mem */
+ "CardBus bridge window 1", /* mem */
+ };
+
+ if (resno < ARRAY_SIZE(cardbus_name))
+ return cardbus_name[resno];
+
+ return "unknown";
+}
+
int pci_bus_size_cardbus_bridge(struct pci_bus *bus,
struct list_head *realloc_head)
{
--
2.47.3