aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-01-01 11:40:50 -0500
committerJesse Barnes <jbarnes@virtuousgeek.org>2010-02-22 19:16:57 -0500
commit3b7a17fcdae532d29dffab9d564a28be08960988 (patch)
tree64ac96e997751e34fcd237485fac9b868d1e0614 /include
parentb26b2d494b659f988b4d75eb394dfa0ddac415c9 (diff)
resource/PCI: mark struct resource as const
Now that we return the new resource start position, there is no need to update "struct resource" inside the align function. Therefore, mark the struct resource as const. Cc: Bjorn Helgaas <bjorn.helgaas@hp.com> Cc: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/ioport.h2
-rw-r--r--include/linux/pci.h5
2 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index f4195de4eb9d..4a811891dbe3 100644
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -121,7 +121,7 @@ extern int allocate_resource(struct resource *root, struct resource *new,
121 resource_size_t size, resource_size_t min, 121 resource_size_t size, resource_size_t min,
122 resource_size_t max, resource_size_t align, 122 resource_size_t max, resource_size_t align,
123 resource_size_t (*alignf)(void *, 123 resource_size_t (*alignf)(void *,
124 struct resource *, 124 const struct resource *,
125 resource_size_t, 125 resource_size_t,
126 resource_size_t), 126 resource_size_t),
127 void *alignf_data); 127 void *alignf_data);
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 1bd9f52b24b8..449d51560fc2 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -592,7 +592,7 @@ int __must_check pcibios_enable_device(struct pci_dev *, int mask);
592char *pcibios_setup(char *str); 592char *pcibios_setup(char *str);
593 593
594/* Used only when drivers/pci/setup.c is used */ 594/* Used only when drivers/pci/setup.c is used */
595resource_size_t pcibios_align_resource(void *, struct resource *, 595resource_size_t pcibios_align_resource(void *, const struct resource *,
596 resource_size_t, 596 resource_size_t,
597 resource_size_t); 597 resource_size_t);
598void pcibios_update_irq(struct pci_dev *, int irq); 598void pcibios_update_irq(struct pci_dev *, int irq);
@@ -828,7 +828,8 @@ int __must_check pci_bus_alloc_resource(struct pci_bus *bus,
828 struct resource *res, resource_size_t size, 828 struct resource *res, resource_size_t size,
829 resource_size_t align, resource_size_t min, 829 resource_size_t align, resource_size_t min,
830 unsigned int type_mask, 830 unsigned int type_mask,
831 resource_size_t (*alignf)(void *, struct resource *, 831 resource_size_t (*alignf)(void *,
832 const struct resource *,
832 resource_size_t, 833 resource_size_t,
833 resource_size_t), 834 resource_size_t),
834 void *alignf_data); 835 void *alignf_data);