]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
PCI: Convert pci_resource_alignment() input parameters to const
authorIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Wed, 29 Apr 2026 12:26:14 +0000 (15:26 +0300)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 23 Jun 2026 17:08:52 +0000 (12:08 -0500)
pci_resource_alignment() calculates resource alignment and should not alter
its input structs. Make its input parameters const.

It requires making also pci_cardbus_resource_alignment() input const.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Link: https://patch.msgid.link/20260429122617.7324-9-ilpo.jarvinen@linux.intel.com
drivers/pci/pci.h
drivers/pci/setup-cardbus.c

index 710803be3a791ec7093f2fe8334e9d646300e92a..e0fcc33dfef60ca636da4bea8eb2f717b0dd422b 100644 (file)
@@ -419,7 +419,7 @@ static inline bool pci_is_cardbus_bridge(struct pci_dev *dev)
        return dev->hdr_type == PCI_HEADER_TYPE_CARDBUS;
 }
 #ifdef CONFIG_CARDBUS
-unsigned long pci_cardbus_resource_alignment(struct resource *res);
+unsigned long pci_cardbus_resource_alignment(const struct resource *res);
 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,
@@ -428,7 +428,7 @@ int pci_cardbus_scan_bridge_extend(struct pci_bus *bus, struct pci_dev *dev,
 int pci_setup_cardbus(char *str);
 
 #else
-static inline unsigned long pci_cardbus_resource_alignment(struct resource *res)
+static inline unsigned long pci_cardbus_resource_alignment(const struct resource *res)
 {
        return 0;
 }
@@ -1044,8 +1044,8 @@ static inline void pci_suspend_ptm(struct pci_dev *dev) { }
 static inline void pci_resume_ptm(struct pci_dev *dev) { }
 #endif
 
-static inline resource_size_t pci_resource_alignment(struct pci_dev *dev,
-                                                    struct resource *res)
+static inline resource_size_t pci_resource_alignment(const struct pci_dev *dev,
+                                                    const struct resource *res)
 {
        int resno = pci_resource_num(dev, res);
 
index 1ebd13a1f7302369019607f232fcc60825317ca3..0cba404080ad68318021c48aacd5aa097f9d515d 100644 (file)
@@ -22,7 +22,7 @@
 static unsigned long pci_cardbus_io_size = DEFAULT_CARDBUS_IO_SIZE;
 static unsigned long pci_cardbus_mem_size = DEFAULT_CARDBUS_MEM_SIZE;
 
-unsigned long pci_cardbus_resource_alignment(struct resource *res)
+unsigned long pci_cardbus_resource_alignment(const struct resource *res)
 {
        if (res->flags & IORESOURCE_IO)
                return pci_cardbus_io_size;