Commit 3c990e92 authored by Jeff Garzik's avatar Jeff Garzik Committed by Greg Kroah-Hartman
Browse files

[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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 309e57df

drivers/pci/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -639,7 +639,7 @@ void pci_release_region(struct pci_dev *pdev, int bar) 
 *	Returns 0 on success, or %EBUSY on error.  A warning

 *	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)

		return 0;
@@ -697,7 +697,7 @@ void pci_release_regions(struct pci_dev *pdev) 
 *	Returns 0 on success, or %EBUSY on error.  A warning

 *	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;

include/linux/pci.h

+2 −2
Original line number Diff line number Diff line
@@ -490,9 +490,9 @@ void pdev_sort_resources(struct pci_dev *, struct resource_list *); 
void pci_fixup_irqs(u8 (*)(struct pci_dev *, u8 *),

		    int (*)(struct pci_dev *, u8, u8));

#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 *);

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);



/* drivers/pci/bus.c */