diff options
-rw-r--r-- | arch/alpha/include/asm/machvec.h | 2 | ||||
-rw-r--r-- | arch/alpha/kernel/sys_dp264.c | 2 | ||||
-rw-r--r-- | include/linux/pci.h | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/arch/alpha/include/asm/machvec.h b/arch/alpha/include/asm/machvec.h index 13cd42743810..72dbf2359270 100644 --- a/arch/alpha/include/asm/machvec.h +++ b/arch/alpha/include/asm/machvec.h | |||
@@ -90,7 +90,7 @@ struct alpha_machine_vector | |||
90 | void (*kill_arch)(int); | 90 | void (*kill_arch)(int); |
91 | 91 | ||
92 | u8 (*pci_swizzle)(struct pci_dev *, u8 *); | 92 | u8 (*pci_swizzle)(struct pci_dev *, u8 *); |
93 | int (*pci_map_irq)(struct pci_dev *, u8, u8); | 93 | int (*pci_map_irq)(const struct pci_dev *, u8, u8); |
94 | struct pci_ops *pci_ops; | 94 | struct pci_ops *pci_ops; |
95 | 95 | ||
96 | struct _alpha_agp_info *(*agp_info)(void); | 96 | struct _alpha_agp_info *(*agp_info)(void); |
diff --git a/arch/alpha/kernel/sys_dp264.c b/arch/alpha/kernel/sys_dp264.c index bb7f0c7cb17a..13f0717fc7fe 100644 --- a/arch/alpha/kernel/sys_dp264.c +++ b/arch/alpha/kernel/sys_dp264.c | |||
@@ -366,7 +366,7 @@ clipper_init_irq(void) | |||
366 | */ | 366 | */ |
367 | 367 | ||
368 | static int __init | 368 | static int __init |
369 | isa_irq_fixup(struct pci_dev *dev, int irq) | 369 | isa_irq_fixup(const struct pci_dev *dev, int irq) |
370 | { | 370 | { |
371 | u8 irq8; | 371 | u8 irq8; |
372 | 372 | ||
diff --git a/include/linux/pci.h b/include/linux/pci.h index a16b1df3deff..766afe93d5d3 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -746,28 +746,28 @@ int pci_bus_write_config_dword(struct pci_bus *bus, unsigned int devfn, | |||
746 | int where, u32 val); | 746 | int where, u32 val); |
747 | struct pci_ops *pci_bus_set_ops(struct pci_bus *bus, struct pci_ops *ops); | 747 | struct pci_ops *pci_bus_set_ops(struct pci_bus *bus, struct pci_ops *ops); |
748 | 748 | ||
749 | static inline int pci_read_config_byte(struct pci_dev *dev, int where, u8 *val) | 749 | static inline int pci_read_config_byte(const struct pci_dev *dev, int where, u8 *val) |
750 | { | 750 | { |
751 | return pci_bus_read_config_byte(dev->bus, dev->devfn, where, val); | 751 | return pci_bus_read_config_byte(dev->bus, dev->devfn, where, val); |
752 | } | 752 | } |
753 | static inline int pci_read_config_word(struct pci_dev *dev, int where, u16 *val) | 753 | static inline int pci_read_config_word(const struct pci_dev *dev, int where, u16 *val) |
754 | { | 754 | { |
755 | return pci_bus_read_config_word(dev->bus, dev->devfn, where, val); | 755 | return pci_bus_read_config_word(dev->bus, dev->devfn, where, val); |
756 | } | 756 | } |
757 | static inline int pci_read_config_dword(struct pci_dev *dev, int where, | 757 | static inline int pci_read_config_dword(const struct pci_dev *dev, int where, |
758 | u32 *val) | 758 | u32 *val) |
759 | { | 759 | { |
760 | return pci_bus_read_config_dword(dev->bus, dev->devfn, where, val); | 760 | return pci_bus_read_config_dword(dev->bus, dev->devfn, where, val); |
761 | } | 761 | } |
762 | static inline int pci_write_config_byte(struct pci_dev *dev, int where, u8 val) | 762 | static inline int pci_write_config_byte(const struct pci_dev *dev, int where, u8 val) |
763 | { | 763 | { |
764 | return pci_bus_write_config_byte(dev->bus, dev->devfn, where, val); | 764 | return pci_bus_write_config_byte(dev->bus, dev->devfn, where, val); |
765 | } | 765 | } |
766 | static inline int pci_write_config_word(struct pci_dev *dev, int where, u16 val) | 766 | static inline int pci_write_config_word(const struct pci_dev *dev, int where, u16 val) |
767 | { | 767 | { |
768 | return pci_bus_write_config_word(dev->bus, dev->devfn, where, val); | 768 | return pci_bus_write_config_word(dev->bus, dev->devfn, where, val); |
769 | } | 769 | } |
770 | static inline int pci_write_config_dword(struct pci_dev *dev, int where, | 770 | static inline int pci_write_config_dword(const struct pci_dev *dev, int where, |
771 | u32 val) | 771 | u32 val) |
772 | { | 772 | { |
773 | return pci_bus_write_config_dword(dev->bus, dev->devfn, where, val); | 773 | return pci_bus_write_config_dword(dev->bus, dev->devfn, where, val); |