lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] PCI: fix pci_request_region[s] arg

Browse Source 
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>
This commit is contained in:
Jeff Garzik
2006-03-04 21:52:42 -05:00
committed by Greg Kroah-Hartman
parent 309e57df7b
commit 3c990e9219
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/pci/pci.c
View File

@@ -639,7 +639,7 @@ void pci_release_region(struct pci_dev *pdev, int bar)
* Returns 0 on success, or %EBUSY on error. A warning * Returns 0 on success, or %EBUSY on error. A warning
* message is also printed on failure. * message is also printed on failure.
*/ */
int pci_request_region(struct pci_dev *pdev, int bar, char *res_name) int pci_request_region(struct pci_dev *pdev, int bar, const char *res_name)
{ {
if (pci_resource_len(pdev, bar) == 0) if (pci_resource_len(pdev, bar) == 0)
return 0; return 0;
@@ -697,7 +697,7 @@ void pci_release_regions(struct pci_dev *pdev)
* Returns 0 on success, or %EBUSY on error. A warning * Returns 0 on success, or %EBUSY on error. A warning
* message is also printed on failure. * message is also printed on failure.
*/ */
int pci_request_regions(struct pci_dev *pdev, char *res_name) int pci_request_regions(struct pci_dev *pdev, const char *res_name)
{ {
int i; int i;

4
include/linux/pci.h
View File

@@ -490,9 +490,9 @@ void pdev_sort_resources(struct pci_dev *, struct resource_list *);
void pci_fixup_irqs(u8 (*)(struct pci_dev *, u8 *), void pci_fixup_irqs(u8 (*)(struct pci_dev *, u8 *),
int (*)(struct pci_dev *, u8, u8)); int (*)(struct pci_dev *, u8, u8));
#define HAVE_PCI_REQ_REGIONS 2 #define HAVE_PCI_REQ_REGIONS 2
int pci_request_regions(struct pci_dev *, char *); int pci_request_regions(struct pci_dev *, const char *);
void pci_release_regions(struct pci_dev *); void pci_release_regions(struct pci_dev *);
int pci_request_region(struct pci_dev *, int, char *); int pci_request_region(struct pci_dev *, int, const char *);
void pci_release_region(struct pci_dev *, int); void pci_release_region(struct pci_dev *, int);
/* drivers/pci/bus.c */ /* drivers/pci/bus.c */