diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-03-04 21:52:42 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-03-23 17:35:16 -0500 |
commit | 3c990e9219ea0b0aee588473ce6c8a66cdee3ff5 (patch) | |
tree | 75279b66b201150b453dbe429a9dac22c4530b7e | |
parent | 309e57df7b766172ba137a8cbd909f88dd76e8e9 (diff) |
[PATCH] PCI: fix pci_request_region[s] arg
Add missing 'const' to pci_request_region[s] 'res_name' arg,
since we pass it directly to __request_region(), whose 'name' arg
is also const.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/pci/pci.c | 4 | ||||
-rw-r--r-- | include/linux/pci.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 03af23238939..bea1ad1ad5ba 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
@@ -639,7 +639,7 @@ void pci_release_region(struct pci_dev *pdev, int bar) | |||
639 | * Returns 0 on success, or %EBUSY on error. A warning | 639 | * Returns 0 on success, or %EBUSY on error. A warning |
640 | * message is also printed on failure. | 640 | * message is also printed on failure. |
641 | */ | 641 | */ |
642 | int pci_request_region(struct pci_dev *pdev, int bar, char *res_name) | 642 | int pci_request_region(struct pci_dev *pdev, int bar, const char *res_name) |
643 | { | 643 | { |
644 | if (pci_resource_len(pdev, bar) == 0) | 644 | if (pci_resource_len(pdev, bar) == 0) |
645 | return 0; | 645 | return 0; |
@@ -697,7 +697,7 @@ void pci_release_regions(struct pci_dev *pdev) | |||
697 | * Returns 0 on success, or %EBUSY on error. A warning | 697 | * Returns 0 on success, or %EBUSY on error. A warning |
698 | * message is also printed on failure. | 698 | * message is also printed on failure. |
699 | */ | 699 | */ |
700 | int pci_request_regions(struct pci_dev *pdev, char *res_name) | 700 | int pci_request_regions(struct pci_dev *pdev, const char *res_name) |
701 | { | 701 | { |
702 | int i; | 702 | int i; |
703 | 703 | ||
diff --git a/include/linux/pci.h b/include/linux/pci.h index d4d533fa5d30..0aad5a378e95 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -490,9 +490,9 @@ void pdev_sort_resources(struct pci_dev *, struct resource_list *); | |||
490 | void pci_fixup_irqs(u8 (*)(struct pci_dev *, u8 *), | 490 | void pci_fixup_irqs(u8 (*)(struct pci_dev *, u8 *), |
491 | int (*)(struct pci_dev *, u8, u8)); | 491 | int (*)(struct pci_dev *, u8, u8)); |
492 | #define HAVE_PCI_REQ_REGIONS 2 | 492 | #define HAVE_PCI_REQ_REGIONS 2 |
493 | int pci_request_regions(struct pci_dev *, char *); | 493 | int pci_request_regions(struct pci_dev *, const char *); |
494 | void pci_release_regions(struct pci_dev *); | 494 | void pci_release_regions(struct pci_dev *); |
495 | int pci_request_region(struct pci_dev *, int, char *); | 495 | int pci_request_region(struct pci_dev *, int, const char *); |
496 | void pci_release_region(struct pci_dev *, int); | 496 | void pci_release_region(struct pci_dev *, int); |
497 | 497 | ||
498 | /* drivers/pci/bus.c */ | 498 | /* drivers/pci/bus.c */ |