tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Dominik Brodowski and committed by
Jesse Barnes 3b7a17fc b26b2d49

+28 -26
+1 -1
arch/alpha/kernel/pci.c
··· 127 127 #define GB (1024*MB) 128 128 129 129 resource_size_t 130 - pcibios_align_resource(void *data, struct resource *res, 130 + pcibios_align_resource(void *data, const struct resource *res, 131 131 resource_size_t size, resource_size_t align) 132 132 { 133 133 struct pci_dev *dev = data;
+1 -1
arch/arm/kernel/bios32.c
··· 616 616 * but we want to try to avoid allocating at 0x2900-0x2bff 617 617 * which might be mirrored at 0x0100-0x03ff.. 618 618 */ 619 - resource_size_t pcibios_align_resource(void *data, struct resource *res, 619 + resource_size_t pcibios_align_resource(void *data, const struct resource *res, 620 620 resource_size_t size, resource_size_t align) 621 621 { 622 622 resource_size_t start = res->start;
+1 -1
arch/cris/arch-v32/drivers/pci/bios.c
··· 42 42 } 43 43 44 44 resource_size_t 45 - pcibios_align_resource(void *data, struct resource *res, 45 + pcibios_align_resource(void *data, const struct resource *res, 46 46 resource_size_t size, resource_size_t align) 47 47 { 48 48 resource_size_t start = res->start;
+1 -1
arch/frv/mb93090-mb00/pci-frv.c
··· 33 33 * which might have be mirrored at 0x0100-0x03ff.. 34 34 */ 35 35 resource_size_t 36 - pcibios_align_resource(void *data, struct resource *res, 36 + pcibios_align_resource(void *data, const struct resource *res, 37 37 resource_size_t size, resource_size_t align) 38 38 { 39 39 resource_size_t start = res->start;
+1 -1
arch/ia64/pci/pci.c
··· 548 548 } 549 549 550 550 resource_size_t 551 - pcibios_align_resource (void *data, struct resource *res, 551 + pcibios_align_resource (void *data, const struct resource *res, 552 552 resource_size_t size, resource_size_t align) 553 553 { 554 554 return res->start;
+1 -1
arch/mips/pci/pci.c
··· 50 50 * which might have be mirrored at 0x0100-0x03ff.. 51 51 */ 52 52 resource_size_t 53 - pcibios_align_resource(void *data, struct resource *res, 53 + pcibios_align_resource(void *data, const struct resource *res, 54 54 resource_size_t size, resource_size_t align) 55 55 { 56 56 struct pci_dev *dev = data;
+1 -1
arch/mips/pmc-sierra/yosemite/ht.c
··· 345 345 return pcibios_enable_resources(dev); 346 346 } 347 347 348 - resource_size_t pcibios_align_resource(void *data, struct resource *res, 348 + resource_size_t pcibios_align_resource(void *data, const struct resource *res, 349 349 resource_size_t size, resource_size_t align) 350 350 { 351 351 struct pci_dev *dev = data;
+1 -1
arch/mn10300/unit-asb2305/pci-asb2305.c
··· 31 31 * but we want to try to avoid allocating at 0x2900-0x2bff 32 32 * which might have be mirrored at 0x0100-0x03ff.. 33 33 */ 34 - resource_size_t pcibios_align_resource(void *data, struct resource *res, 34 + resource_size_t pcibios_align_resource(void *data, const struct resource *res, 35 35 resource_size_t size, resource_size_t align) 36 36 { 37 37 resource_size_t start = res->start;
+1 -1
arch/parisc/kernel/pci.c
··· 254 254 * Since we are just checking candidates, don't use any fields other 255 255 * than res->start. 256 256 */ 257 - resource_size_t pcibios_align_resource(void *data, struct resource *res, 257 + resource_size_t pcibios_align_resource(void *data, const struct resource *res, 258 258 resource_size_t size, resource_size_t alignment) 259 259 { 260 260 resource_size_t mask, align, start = res->start;
+1 -1
arch/powerpc/kernel/pci-common.c
··· 1181 1181 * but we want to try to avoid allocating at 0x2900-0x2bff 1182 1182 * which might have be mirrored at 0x0100-0x03ff.. 1183 1183 */ 1184 - resource_size_t pcibios_align_resource(void *data, struct resource *res, 1184 + resource_size_t pcibios_align_resource(void *data, const struct resource *res, 1185 1185 resource_size_t size, resource_size_t align) 1186 1186 { 1187 1187 struct pci_dev *dev = data;
+1 -1
arch/sh/drivers/pci/pci.c
··· 148 148 * addresses to be allocated in the 0x000-0x0ff region 149 149 * modulo 0x400. 150 150 */ 151 - resource_size_t pcibios_align_resource(void *data, struct resource *res, 151 + resource_size_t pcibios_align_resource(void *data, const struct resource *res, 152 152 resource_size_t size, resource_size_t align) 153 153 { 154 154 struct pci_dev *dev = data;
+1 -1
arch/sparc/kernel/pci.c
··· 722 722 { 723 723 } 724 724 725 - resource_size_t pcibios_align_resource(void *data, struct resource *res, 725 + resource_size_t pcibios_align_resource(void *data, const struct resource *res, 726 726 resource_size_t size, resource_size_t align) 727 727 { 728 728 return res->start;
+1 -1
arch/sparc/kernel/pcic.c
··· 768 768 return str; 769 769 } 770 770 771 - resource_size_t pcibios_align_resource(void *data, struct resource *res, 771 + resource_size_t pcibios_align_resource(void *data, const struct resource *res, 772 772 resource_size_t size, resource_size_t align) 773 773 { 774 774 return res->start;
+1 -1
arch/x86/pci/i386.c
··· 61 61 * which might have be mirrored at 0x0100-0x03ff.. 62 62 */ 63 63 resource_size_t 64 - pcibios_align_resource(void *data, struct resource *res, 64 + pcibios_align_resource(void *data, const struct resource *res, 65 65 resource_size_t size, resource_size_t align) 66 66 { 67 67 struct pci_dev *dev = data;
+2 -2
arch/xtensa/kernel/pci.c
··· 70 70 * which might have be mirrored at 0x0100-0x03ff.. 71 71 */ 72 72 resource_size_t 73 - pcibios_align_resource(void *data, struct resource *res, resource_size_t size, 74 - resource_size_t align) 73 + pcibios_align_resource(void *data, const struct resource *res, 74 + resource_size_t size, resource_size_t align) 75 75 { 76 76 struct pci_dev *dev = data; 77 77 resource_size_t start = res->start;
+1 -1
drivers/pci/bus.c
··· 37 37 resource_size_t size, resource_size_t align, 38 38 resource_size_t min, unsigned int type_mask, 39 39 resource_size_t (*alignf)(void *, 40 - struct resource *, 40 + const struct resource *, 41 41 resource_size_t, 42 42 resource_size_t), 43 43 void *alignf_data)
+2 -1
drivers/pcmcia/rsrc_mgr.c
··· 114 114 unsigned long offset; 115 115 }; 116 116 117 - static resource_size_t pcmcia_align(void *align_data, struct resource *res, 117 + static resource_size_t pcmcia_align(void *align_data, 118 + const struct resource *res, 118 119 resource_size_t size, resource_size_t align) 119 120 { 120 121 struct pcmcia_align_data *data = align_data;
+3 -3
drivers/pcmcia/rsrc_nonstatic.c
··· 534 534 }; 535 535 536 536 static resource_size_t 537 - pcmcia_common_align(void *align_data, struct resource *res, 537 + pcmcia_common_align(void *align_data, const struct resource *res, 538 538 resource_size_t size, resource_size_t align) 539 539 { 540 540 struct pcmcia_align_data *data = align_data; ··· 549 549 } 550 550 551 551 static resource_size_t 552 - pcmcia_align(void *align_data, struct resource *res, resource_size_t size, 553 - resource_size_t align) 552 + pcmcia_align(void *align_data, const struct resource *res, 553 + resource_size_t size, resource_size_t align) 554 554 { 555 555 struct pcmcia_align_data *data = align_data; 556 556 struct resource_map *m;
+1 -1
include/linux/ioport.h
··· 121 121 resource_size_t size, resource_size_t min, 122 122 resource_size_t max, resource_size_t align, 123 123 resource_size_t (*alignf)(void *, 124 - struct resource *, 124 + const struct resource *, 125 125 resource_size_t, 126 126 resource_size_t), 127 127 void *alignf_data);
+3 -2
include/linux/pci.h
··· 592 592 char *pcibios_setup(char *str); 593 593 594 594 /* Used only when drivers/pci/setup.c is used */ 595 - resource_size_t pcibios_align_resource(void *, struct resource *, 595 + resource_size_t pcibios_align_resource(void *, const struct resource *, 596 596 resource_size_t, 597 597 resource_size_t); 598 598 void pcibios_update_irq(struct pci_dev *, int irq); ··· 828 828 struct resource *res, resource_size_t size, 829 829 resource_size_t align, resource_size_t min, 830 830 unsigned int type_mask, 831 - resource_size_t (*alignf)(void *, struct resource *, 831 + resource_size_t (*alignf)(void *, 832 + const struct resource *, 832 833 resource_size_t, 833 834 resource_size_t), 834 835 void *alignf_data);
+2 -2
kernel/resource.c
··· 304 304 resource_size_t size, resource_size_t min, 305 305 resource_size_t max, resource_size_t align, 306 306 resource_size_t (*alignf)(void *, 307 - struct resource *, 307 + const struct resource *, 308 308 resource_size_t, 309 309 resource_size_t), 310 310 void *alignf_data) ··· 361 361 resource_size_t size, resource_size_t min, 362 362 resource_size_t max, resource_size_t align, 363 363 resource_size_t (*alignf)(void *, 364 - struct resource *, 364 + const struct resource *, 365 365 resource_size_t, 366 366 resource_size_t), 367 367 void *alignf_data)