git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
of: Always use 'struct device.of_node' to get device node pointer.
[safe/jmp/linux-2.6]
/
arch
/
sparc
/
kernel
/
pci_schizo.c
diff --git
a/arch/sparc/kernel/pci_schizo.c
b/arch/sparc/kernel/pci_schizo.c
index
2b5cdde
..
2f3f921
100644
(file)
--- a/
arch/sparc/kernel/pci_schizo.c
+++ b/
arch/sparc/kernel/pci_schizo.c
@@
-844,7
+844,7
@@
static int pbm_routes_this_ino(struct pci_pbm_info *pbm, u32 ino)
*/
static void tomatillo_register_error_handlers(struct pci_pbm_info *pbm)
{
*/
static void tomatillo_register_error_handlers(struct pci_pbm_info *pbm)
{
- struct of_device *op = of_find_device_by_node(pbm->op->node);
+ struct of_device *op = of_find_device_by_node(pbm->op->
dev.of_
node);
u64 tmp, err_mask, err_no_mask;
int err;
u64 tmp, err_mask, err_no_mask;
int err;
@@
-939,7
+939,7
@@
static void tomatillo_register_error_handlers(struct pci_pbm_info *pbm)
static void schizo_register_error_handlers(struct pci_pbm_info *pbm)
{
static void schizo_register_error_handlers(struct pci_pbm_info *pbm)
{
- struct of_device *op = of_find_device_by_node(pbm->op->node);
+ struct of_device *op = of_find_device_by_node(pbm->op->
dev.of_
node);
u64 tmp, err_mask, err_no_mask;
int err;
u64 tmp, err_mask, err_no_mask;
int err;
@@
-1068,7
+1068,7
@@
static void __devinit schizo_scan_bus(struct pci_pbm_info *pbm,
{
pbm_config_busmastering(pbm);
pbm->is_66mhz_capable =
{
pbm_config_busmastering(pbm);
pbm->is_66mhz_capable =
- (of_find_property(pbm->op->node, "66mhz-capable", NULL)
+ (of_find_property(pbm->op->
dev.of_
node, "66mhz-capable", NULL)
!= NULL);
pbm->pci_bus = pci_scan_one_pbm(pbm, parent);
!= NULL);
pbm->pci_bus = pci_scan_one_pbm(pbm, parent);
@@
-1138,7
+1138,7
@@
static int schizo_pbm_iommu_init(struct pci_pbm_info *pbm)
u32 dma_mask;
u64 control;
u32 dma_mask;
u64 control;
- vdma = of_get_property(pbm->op->node, "virtual-dma", NULL);
+ vdma = of_get_property(pbm->op->
dev.of_
node, "virtual-dma", NULL);
if (!vdma)
vdma = vdma_default;
if (!vdma)
vdma = vdma_default;
@@
-1268,7
+1268,7
@@
static void schizo_pbm_hw_init(struct pci_pbm_info *pbm)
pbm->chip_version >= 0x2)
tmp |= 0x3UL << SCHIZO_PCICTRL_PTO_SHIFT;
pbm->chip_version >= 0x2)
tmp |= 0x3UL << SCHIZO_PCICTRL_PTO_SHIFT;
- if (!of_find_property(pbm->op->node, "no-bus-parking", NULL))
+ if (!of_find_property(pbm->op->
dev.of_
node, "no-bus-parking", NULL))
tmp |= SCHIZO_PCICTRL_PARK;
else
tmp &= ~SCHIZO_PCICTRL_PARK;
tmp |= SCHIZO_PCICTRL_PARK;
else
tmp &= ~SCHIZO_PCICTRL_PARK;
@@
-1311,7
+1311,7
@@
static int __devinit schizo_pbm_init(struct pci_pbm_info *pbm,
int chip_type)
{
const struct linux_prom64_registers *regs;
int chip_type)
{
const struct linux_prom64_registers *regs;
- struct device_node *dp = op->node;
+ struct device_node *dp = op->
dev.of_
node;
const char *chipset_name;
int is_pbm_a, err;
const char *chipset_name;
int is_pbm_a, err;
@@
-1415,7
+1415,7
@@
static struct pci_pbm_info * __devinit schizo_find_sibling(u32 portid,
static int __devinit __schizo_init(struct of_device *op, unsigned long chip_type)
{
static int __devinit __schizo_init(struct of_device *op, unsigned long chip_type)
{
- struct device_node *dp = op->node;
+ struct device_node *dp = op->
dev.of_
node;
struct pci_pbm_info *pbm;
struct iommu *iommu;
u32 portid;
struct pci_pbm_info *pbm;
struct iommu *iommu;
u32 portid;