UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[SPARC64]: Fix PCI rework to adhere to of_get_property() const return. 

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2007-03-29 01:50:16 -07:00
parent f1cfdb55f1
commit a165b4205e
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/sparc64/kernel/of_device.c
View File

@ -317,7 +317,7 @@ static unsigned int of_bus_default_get_flags(const u32 *addr)
static int of_bus_pci_match(struct device_node *np) static int of_bus_pci_match(struct device_node *np)
{ {
if (!strcmp(np->type, "pci") || !strcmp(np->type, "pciex")) { if (!strcmp(np->type, "pci") || !strcmp(np->type, "pciex")) {
char *model = of_get_property(np, "model", NULL); const char *model = of_get_property(np, "model", NULL);
if (model && !strcmp(model, "SUNW,simba")) if (model && !strcmp(model, "SUNW,simba"))
return 0; return 0;
@ -339,7 +339,7 @@ static int of_bus_pci_match(struct device_node *np)
static int of_bus_simba_match(struct device_node *np) static int of_bus_simba_match(struct device_node *np)
{ {
char *model = of_get_property(np, "model", NULL); const char *model = of_get_property(np, "model", NULL);
if (model && !strcmp(model, "SUNW,simba")) if (model && !strcmp(model, "SUNW,simba"))
return 1; return 1;

2
arch/sparc64/kernel/pci.c
View File

@ -551,7 +551,7 @@ void __devinit of_scan_pci_bridge(struct pci_pbm_info *pbm,
ranges = of_get_property(node, "ranges", &len); ranges = of_get_property(node, "ranges", &len);
simba = 0; simba = 0;
if (ranges == NULL) { if (ranges == NULL) {
char *model = of_get_property(node, "model", NULL); const char *model = of_get_property(node, "model", NULL);
if (model && !strcmp(model, "SUNW,simba")) { if (model && !strcmp(model, "SUNW,simba")) {
simba = 1; simba = 1;
} else { } else {

6
arch/sparc64/kernel/pci_common.c
View File

@ -54,7 +54,7 @@ static void pci_register_legacy_regions(struct resource *io_res,
static void pci_register_iommu_region(struct pci_pbm_info *pbm) static void pci_register_iommu_region(struct pci_pbm_info *pbm)
{ {
u32 *vdma = of_get_property(pbm->prom_node, "virtual-dma", NULL); const u32 *vdma = of_get_property(pbm->prom_node, "virtual-dma", NULL);
if (vdma) { if (vdma) {
struct resource *rp = kmalloc(sizeof(*rp), GFP_KERNEL); struct resource *rp = kmalloc(sizeof(*rp), GFP_KERNEL);
@ -73,7 +73,7 @@ static void pci_register_iommu_region(struct pci_pbm_info *pbm)
void pci_determine_mem_io_space(struct pci_pbm_info *pbm) void pci_determine_mem_io_space(struct pci_pbm_info *pbm)
{ {
struct linux_prom_pci_ranges *pbm_ranges; const struct linux_prom_pci_ranges *pbm_ranges;
int i, saw_mem, saw_io; int i, saw_mem, saw_io;
int num_pbm_ranges; int num_pbm_ranges;
@ -82,7 +82,7 @@ void pci_determine_mem_io_space(struct pci_pbm_info *pbm)
num_pbm_ranges = i / sizeof(*pbm_ranges); num_pbm_ranges = i / sizeof(*pbm_ranges);
for (i = 0; i < num_pbm_ranges; i++) { for (i = 0; i < num_pbm_ranges; i++) {
struct linux_prom_pci_ranges *pr = &pbm_ranges[i]; const struct linux_prom_pci_ranges *pr = &pbm_ranges[i];
unsigned long a; unsigned long a;
u32 parent_phys_hi, parent_phys_lo; u32 parent_phys_hi, parent_phys_lo;
int type; int type;

6
arch/sparc64/kernel/pci_sabre.c
View File

@ -1015,12 +1015,12 @@ static void sabre_pbm_init(struct pci_controller_info *p, struct device_node *dp
void sabre_init(struct device_node *dp, char *model_name) void sabre_init(struct device_node *dp, char *model_name)
{ {
struct linux_prom64_registers *pr_regs; const struct linux_prom64_registers *pr_regs;
struct pci_controller_info *p; struct pci_controller_info *p;
struct pci_iommu *iommu; struct pci_iommu *iommu;
int tsbsize; int tsbsize;
u32 *busrange; const u32 *busrange;
u32 *vdma; const u32 *vdma;
u32 upa_portid, dma_mask; u32 upa_portid, dma_mask;
u64 clear_irq; u64 clear_irq;

6
arch/sparc64/kernel/pci_schizo.c
View File

@ -1490,11 +1490,11 @@ static void schizo_pbm_init(struct pci_controller_info *p,
struct device_node *dp, u32 portid, struct device_node *dp, u32 portid,
int chip_type) int chip_type)
{ {
struct linux_prom64_registers *regs; const struct linux_prom64_registers *regs;
unsigned int *busrange; const unsigned int *busrange;
struct pci_pbm_info *pbm; struct pci_pbm_info *pbm;
const char *chipset_name; const char *chipset_name;
u32 *ino_bitmap; const u32 *ino_bitmap;
int is_pbm_a; int is_pbm_a;
switch (chip_type) { switch (chip_type) {