Commit 3c990e9219ea0b0aee588473ce6c8a66cdee3ff5
Committed by
Greg Kroah-Hartman
1 parent
309e57df7b
Exists in
master
and in
4 other branches
[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>
Showing 2 changed files with 4 additions and 4 deletions Side-by-side Diff
drivers/pci/pci.c
| ... | ... | @@ -639,7 +639,7 @@ |
| 639 | 639 | * Returns 0 on success, or %EBUSY on error. A warning |
| 640 | 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 | 644 | if (pci_resource_len(pdev, bar) == 0) |
| 645 | 645 | return 0; |
| ... | ... | @@ -697,7 +697,7 @@ |
| 697 | 697 | * Returns 0 on success, or %EBUSY on error. A warning |
| 698 | 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 | 702 | int i; |
| 703 | 703 |
include/linux/pci.h
| ... | ... | @@ -490,9 +490,9 @@ |
| 490 | 490 | void pci_fixup_irqs(u8 (*)(struct pci_dev *, u8 *), |
| 491 | 491 | int (*)(struct pci_dev *, u8, u8)); |
| 492 | 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 | 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 | 496 | void pci_release_region(struct pci_dev *, int); |
| 497 | 497 | |
| 498 | 498 | /* drivers/pci/bus.c */ |