From fb09de93f08be12e953bbcffd82a296fb82b7e90 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Mon, 19 Mar 2012 00:01:09 +0000 Subject: [PATCH] --- yaml --- r: 291775 b: refs/heads/master c: bf362f750bea1372aff3b5c405b50560a1b28981 h: refs/heads/master i: 291773: a657590d405a685e8d7c5c8cef593c88ebc09fb2 291771: fa0aee7c3b430709b2d8b3842aeda95c0c2fce7e 291767: 400536b76b6ae3fc71ca0814177e6db0e5a629a4 291759: 66f35e2b2bf4c773c51fb813ddf4be49ed2b963e 291743: 46f96cd1b20ddc038f5e2491b0c8183c3f6eeea4 291711: dcca023fa8039e37d564b768321c7db701b2ccde v: v3 --- [refs] | 2 +- trunk/arch/alpha/include/asm/machvec.h | 2 +- trunk/arch/alpha/kernel/sys_dp264.c | 2 +- trunk/include/linux/pci.h | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 6d7fc7c9ed58..5dbc34558243 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: adfe39cd9195c35811e062578c4107db49d75436 +refs/heads/master: bf362f750bea1372aff3b5c405b50560a1b28981 diff --git a/trunk/arch/alpha/include/asm/machvec.h b/trunk/arch/alpha/include/asm/machvec.h index 13cd42743810..72dbf2359270 100644 --- a/trunk/arch/alpha/include/asm/machvec.h +++ b/trunk/arch/alpha/include/asm/machvec.h @@ -90,7 +90,7 @@ struct alpha_machine_vector void (*kill_arch)(int); u8 (*pci_swizzle)(struct pci_dev *, u8 *); - int (*pci_map_irq)(struct pci_dev *, u8, u8); + int (*pci_map_irq)(const struct pci_dev *, u8, u8); struct pci_ops *pci_ops; struct _alpha_agp_info *(*agp_info)(void); diff --git a/trunk/arch/alpha/kernel/sys_dp264.c b/trunk/arch/alpha/kernel/sys_dp264.c index bb7f0c7cb17a..13f0717fc7fe 100644 --- a/trunk/arch/alpha/kernel/sys_dp264.c +++ b/trunk/arch/alpha/kernel/sys_dp264.c @@ -366,7 +366,7 @@ clipper_init_irq(void) */ static int __init -isa_irq_fixup(struct pci_dev *dev, int irq) +isa_irq_fixup(const struct pci_dev *dev, int irq) { u8 irq8; diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h index a16b1df3deff..766afe93d5d3 100644 --- a/trunk/include/linux/pci.h +++ b/trunk/include/linux/pci.h @@ -746,28 +746,28 @@ int pci_bus_write_config_dword(struct pci_bus *bus, unsigned int devfn, int where, u32 val); struct pci_ops *pci_bus_set_ops(struct pci_bus *bus, struct pci_ops *ops); -static inline int pci_read_config_byte(struct pci_dev *dev, int where, u8 *val) +static inline int pci_read_config_byte(const struct pci_dev *dev, int where, u8 *val) { return pci_bus_read_config_byte(dev->bus, dev->devfn, where, val); } -static inline int pci_read_config_word(struct pci_dev *dev, int where, u16 *val) +static inline int pci_read_config_word(const struct pci_dev *dev, int where, u16 *val) { return pci_bus_read_config_word(dev->bus, dev->devfn, where, val); } -static inline int pci_read_config_dword(struct pci_dev *dev, int where, +static inline int pci_read_config_dword(const struct pci_dev *dev, int where, u32 *val) { return pci_bus_read_config_dword(dev->bus, dev->devfn, where, val); } -static inline int pci_write_config_byte(struct pci_dev *dev, int where, u8 val) +static inline int pci_write_config_byte(const struct pci_dev *dev, int where, u8 val) { return pci_bus_write_config_byte(dev->bus, dev->devfn, where, val); } -static inline int pci_write_config_word(struct pci_dev *dev, int where, u16 val) +static inline int pci_write_config_word(const struct pci_dev *dev, int where, u16 val) { return pci_bus_write_config_word(dev->bus, dev->devfn, where, val); } -static inline int pci_write_config_dword(struct pci_dev *dev, int where, +static inline int pci_write_config_dword(const struct pci_dev *dev, int where, u32 val) { return pci_bus_write_config_dword(dev->bus, dev->devfn, where, val);