openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Dominik Brodowski 2010-01-01 17:40:50 +01:00 committed by Jesse Barnes
parent b26b2d494b
commit 3b7a17fcda
21 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/alpha/kernel/pci.c
View File

@ -127,7 +127,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, pcibios_fixup_final);
#define GB (1024*MB)
resource_size_t
pcibios_align_resource(void *data, struct resource *res,
pcibios_align_resource(void *data, const struct resource *res,
resource_size_t size, resource_size_t align)
{
struct pci_dev *dev = data;

2
arch/arm/kernel/bios32.c
View File

@ -616,7 +616,7 @@ char * __init pcibios_setup(char *str)
* but we want to try to avoid allocating at 0x2900-0x2bff
* which might be mirrored at 0x0100-0x03ff..
*/
resource_size_t pcibios_align_resource(void *data, struct resource *res,
resource_size_t pcibios_align_resource(void *data, const struct resource *res,
resource_size_t size, resource_size_t align)
{
resource_size_t start = res->start;

2
arch/cris/arch-v32/drivers/pci/bios.c
View File

@ -42,7 +42,7 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
}
resource_size_t
pcibios_align_resource(void *data, struct resource *res,
pcibios_align_resource(void *data, const struct resource *res,
resource_size_t size, resource_size_t align)
{
resource_size_t start = res->start;

2
arch/frv/mb93090-mb00/pci-frv.c
View File

@ -33,7 +33,7 @@
* which might have be mirrored at 0x0100-0x03ff..
*/
resource_size_t
pcibios_align_resource(void *data, struct resource *res,
pcibios_align_resource(void *data, const struct resource *res,
resource_size_t size, resource_size_t align)
{
resource_size_t start = res->start;

2
arch/ia64/pci/pci.c
View File

@ -548,7 +548,7 @@ pcibios_disable_device (struct pci_dev *dev)
}
resource_size_t
pcibios_align_resource (void *data, struct resource *res,
pcibios_align_resource (void *data, const struct resource *res,
resource_size_t size, resource_size_t align)
{
return res->start;

2
arch/mips/pci/pci.c
View File

@ -50,7 +50,7 @@ static int pci_initialized;
* which might have be mirrored at 0x0100-0x03ff..
*/
resource_size_t
pcibios_align_resource(void *data, struct resource *res,
pcibios_align_resource(void *data, const struct resource *res,
resource_size_t size, resource_size_t align)
{
struct pci_dev *dev = data;

2
arch/mips/pmc-sierra/yosemite/ht.c
View File

@ -345,7 +345,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
return pcibios_enable_resources(dev);
}
resource_size_t pcibios_align_resource(void *data, struct resource *res,
resource_size_t pcibios_align_resource(void *data, const struct resource *res,
resource_size_t size, resource_size_t align)
{
struct pci_dev *dev = data;

2
arch/mn10300/unit-asb2305/pci-asb2305.c
View File

@ -31,7 +31,7 @@
* but we want to try to avoid allocating at 0x2900-0x2bff
* which might have be mirrored at 0x0100-0x03ff..
*/
resource_size_t pcibios_align_resource(void *data, struct resource *res,
resource_size_t pcibios_align_resource(void *data, const struct resource *res,
resource_size_t size, resource_size_t align)
{
resource_size_t start = res->start;

2
arch/parisc/kernel/pci.c
View File

@ -254,7 +254,7 @@ EXPORT_SYMBOL(pcibios_bus_to_resource);
* Since we are just checking candidates, don't use any fields other
* than res->start.
*/
resource_size_t pcibios_align_resource(void *data, struct resource *res,
resource_size_t pcibios_align_resource(void *data, const struct resource *res,
resource_size_t size, resource_size_t alignment)
{
resource_size_t mask, align, start = res->start;

2
arch/powerpc/kernel/pci-common.c
View File

@ -1181,7 +1181,7 @@ static int skip_isa_ioresource_align(struct pci_dev *dev)
* but we want to try to avoid allocating at 0x2900-0x2bff
* which might have be mirrored at 0x0100-0x03ff..
*/
resource_size_t pcibios_align_resource(void *data, struct resource *res,
resource_size_t pcibios_align_resource(void *data, const struct resource *res,
resource_size_t size, resource_size_t align)
{
struct pci_dev *dev = data;

2
arch/sh/drivers/pci/pci.c
View File

@ -148,7 +148,7 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus)
* addresses to be allocated in the 0x000-0x0ff region
* modulo 0x400.
*/
resource_size_t pcibios_align_resource(void *data, struct resource *res,
resource_size_t pcibios_align_resource(void *data, const struct resource *res,
resource_size_t size, resource_size_t align)
{
struct pci_dev *dev = data;

2
arch/sparc/kernel/pci.c
View File

@ -722,7 +722,7 @@ void pcibios_update_irq(struct pci_dev *pdev, int irq)
{
}
resource_size_t pcibios_align_resource(void *data, struct resource *res,
resource_size_t pcibios_align_resource(void *data, const struct resource *res,
resource_size_t size, resource_size_t align)
{
return res->start;

2
arch/sparc/kernel/pcic.c
View File

@ -768,7 +768,7 @@ char * __devinit pcibios_setup(char *str)
return str;
}
resource_size_t pcibios_align_resource(void *data, struct resource *res,
resource_size_t pcibios_align_resource(void *data, const struct resource *res,
resource_size_t size, resource_size_t align)
{
return res->start;

2
arch/x86/pci/i386.c
View File

@ -61,7 +61,7 @@ skip_isa_ioresource_align(struct pci_dev *dev) {
* which might have be mirrored at 0x0100-0x03ff..
*/
resource_size_t
pcibios_align_resource(void *data, struct resource *res,
pcibios_align_resource(void *data, const struct resource *res,
resource_size_t size, resource_size_t align)
{
struct pci_dev *dev = data;

4
arch/xtensa/kernel/pci.c
View File

@ -70,8 +70,8 @@ static int pci_bus_count;
* which might have be mirrored at 0x0100-0x03ff..
*/
resource_size_t
pcibios_align_resource(void *data, struct resource *res, resource_size_t size,
resource_size_t align)
pcibios_align_resource(void *data, const struct resource *res,
resource_size_t size, resource_size_t align)
{
struct pci_dev *dev = data;
resource_size_t start = res->start;

2
drivers/pci/bus.c
View File

@ -37,7 +37,7 @@ pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res,
resource_size_t size, resource_size_t align,
resource_size_t min, unsigned int type_mask,
resource_size_t (*alignf)(void *,
struct resource *,
const struct resource *,
resource_size_t,
resource_size_t),
void *alignf_data)

3
drivers/pcmcia/rsrc_mgr.c
View File

@ -114,7 +114,8 @@ struct pcmcia_align_data {
unsigned long offset;
};
static resource_size_t pcmcia_align(void *align_data, struct resource *res,
static resource_size_t pcmcia_align(void *align_data,
const struct resource *res,
resource_size_t size, resource_size_t align)
{
struct pcmcia_align_data *data = align_data;

6
drivers/pcmcia/rsrc_nonstatic.c
View File

@ -534,7 +534,7 @@ struct pcmcia_align_data {
};
static resource_size_t
pcmcia_common_align(void *align_data, struct resource *res,
pcmcia_common_align(void *align_data, const struct resource *res,
resource_size_t size, resource_size_t align)
{
struct pcmcia_align_data *data = align_data;
@ -549,8 +549,8 @@ pcmcia_common_align(void *align_data, struct resource *res,
}
static resource_size_t
pcmcia_align(void *align_data, struct resource *res, resource_size_t size,
resource_size_t align)
pcmcia_align(void *align_data, const struct resource *res,
resource_size_t size, resource_size_t align)
{
struct pcmcia_align_data *data = align_data;
struct resource_map *m;

2
include/linux/ioport.h
View File

@ -121,7 +121,7 @@ extern int allocate_resource(struct resource *root, struct resource *new,
resource_size_t size, resource_size_t min,
resource_size_t max, resource_size_t align,
resource_size_t (*alignf)(void *,
struct resource *,
const struct resource *,
resource_size_t,
resource_size_t),
void *alignf_data);

5
include/linux/pci.h
View File

@ -592,7 +592,7 @@ int __must_check pcibios_enable_device(struct pci_dev *, int mask);
char *pcibios_setup(char *str);
/* Used only when drivers/pci/setup.c is used */
resource_size_t pcibios_align_resource(void *, struct resource *,
resource_size_t pcibios_align_resource(void *, const struct resource *,
resource_size_t,
resource_size_t);
void pcibios_update_irq(struct pci_dev *, int irq);
@ -828,7 +828,8 @@ int __must_check pci_bus_alloc_resource(struct pci_bus *bus,
struct resource *res, resource_size_t size,
resource_size_t align, resource_size_t min,
unsigned int type_mask,
resource_size_t (*alignf)(void *, struct resource *,
resource_size_t (*alignf)(void *,
const struct resource *,
resource_size_t,
resource_size_t),
void *alignf_data);

4
kernel/resource.c
View File

@ -304,7 +304,7 @@ static int find_resource(struct resource *root, struct resource *new,
resource_size_t size, resource_size_t min,
resource_size_t max, resource_size_t align,
resource_size_t (*alignf)(void *,
struct resource *,
const struct resource *,
resource_size_t,
resource_size_t),
void *alignf_data)
@ -361,7 +361,7 @@ int allocate_resource(struct resource *root, struct resource *new,
resource_size_t size, resource_size_t min,
resource_size_t max, resource_size_t align,
resource_size_t (*alignf)(void *,
struct resource *,
const struct resource *,
resource_size_t,
resource_size_t),
void *alignf_data)