Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
463801b3
Commit
463801b3
authored
Sep 01, 2008
by
David S. Miller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pci_schizo: Use of_get_property() and delete spurious local vars.
Signed-off-by:
David S. Miller
<
davem@davemloft.net
>
parent
0f73d1bb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
17 deletions
+8
-17
arch/sparc64/kernel/pci_schizo.c
arch/sparc64/kernel/pci_schizo.c
+8
-17
No files found.
arch/sparc64/kernel/pci_schizo.c
View file @
463801b3
...
@@ -1152,24 +1152,17 @@ static void schizo_pbm_strbuf_init(struct pci_pbm_info *pbm)
...
@@ -1152,24 +1152,17 @@ static void schizo_pbm_strbuf_init(struct pci_pbm_info *pbm)
static
int
schizo_pbm_iommu_init
(
struct
pci_pbm_info
*
pbm
)
static
int
schizo_pbm_iommu_init
(
struct
pci_pbm_info
*
pbm
)
{
{
st
ruct
iommu
*
iommu
=
pbm
->
iommu
;
st
atic
const
u32
vdma_default
[]
=
{
0xc0000000
,
0x40000000
}
;
unsigned
long
i
,
tagbase
,
database
;
unsigned
long
i
,
tagbase
,
database
;
struct
property
*
prop
;
struct
iommu
*
iommu
=
pbm
->
iommu
;
u32
vdma
[
2
],
dma_mask
;
int
tsbsize
,
err
;
int
tsbsize
,
err
;
const
u32
*
vdma
;
u32
dma_mask
;
u64
control
;
u64
control
;
prop
=
of_find_property
(
pbm
->
prom_node
,
"virtual-dma"
,
NULL
);
vdma
=
of_get_property
(
pbm
->
prom_node
,
"virtual-dma"
,
NULL
);
if
(
prop
)
{
if
(
!
vdma
)
u32
*
val
=
prop
->
value
;
vdma
=
vdma_default
;
vdma
[
0
]
=
val
[
0
];
vdma
[
1
]
=
val
[
1
];
}
else
{
/* No property, use default values. */
vdma
[
0
]
=
0xc0000000
;
vdma
[
1
]
=
0x40000000
;
}
dma_mask
=
vdma
[
0
];
dma_mask
=
vdma
[
0
];
switch
(
vdma
[
1
])
{
switch
(
vdma
[
1
])
{
...
@@ -1284,7 +1277,6 @@ static int schizo_pbm_iommu_init(struct pci_pbm_info *pbm)
...
@@ -1284,7 +1277,6 @@ static int schizo_pbm_iommu_init(struct pci_pbm_info *pbm)
static
void
schizo_pbm_hw_init
(
struct
pci_pbm_info
*
pbm
)
static
void
schizo_pbm_hw_init
(
struct
pci_pbm_info
*
pbm
)
{
{
struct
property
*
prop
;
u64
tmp
;
u64
tmp
;
schizo_write
(
pbm
->
pbm_regs
+
SCHIZO_PCI_IRQ_RETRY
,
5
);
schizo_write
(
pbm
->
pbm_regs
+
SCHIZO_PCI_IRQ_RETRY
,
5
);
...
@@ -1298,8 +1290,7 @@ static void schizo_pbm_hw_init(struct pci_pbm_info *pbm)
...
@@ -1298,8 +1290,7 @@ static void schizo_pbm_hw_init(struct pci_pbm_info *pbm)
pbm
->
chip_version
>=
0x2
)
pbm
->
chip_version
>=
0x2
)
tmp
|=
0x3UL
<<
SCHIZO_PCICTRL_PTO_SHIFT
;
tmp
|=
0x3UL
<<
SCHIZO_PCICTRL_PTO_SHIFT
;
prop
=
of_find_property
(
pbm
->
prom_node
,
"no-bus-parking"
,
NULL
);
if
(
!
of_find_property
(
pbm
->
prom_node
,
"no-bus-parking"
,
NULL
))
if
(
!
prop
)
tmp
|=
SCHIZO_PCICTRL_PARK
;
tmp
|=
SCHIZO_PCICTRL_PARK
;
else
else
tmp
&=
~
SCHIZO_PCICTRL_PARK
;
tmp
&=
~
SCHIZO_PCICTRL_PARK
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment