projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[POWERPC] Trivial ps3 warning fixes
[powerpc.git]
/
arch
/
powerpc
/
platforms
/
ps3
/
spu.c
diff --git
a/arch/powerpc/platforms/ps3/spu.c
b/arch/powerpc/platforms/ps3/spu.c
index
a397e4e
..
651437c
100644
(file)
--- a/
arch/powerpc/platforms/ps3/spu.c
+++ b/
arch/powerpc/platforms/ps3/spu.c
@@
-184,7
+184,7
@@
static int __init setup_areas(struct spu *spu)
spu_pdata(spu)->shadow = __ioremap(
spu_pdata(spu)->shadow_addr, sizeof(struct spe_shadow),
spu_pdata(spu)->shadow = __ioremap(
spu_pdata(spu)->shadow_addr, sizeof(struct spe_shadow),
-
PAGE_READONLY
| _PAGE_NO_CACHE | _PAGE_GUARDED);
+
pgprot_val(PAGE_READONLY)
| _PAGE_NO_CACHE | _PAGE_GUARDED);
if (!spu_pdata(spu)->shadow) {
pr_debug("%s:%d: ioremap shadow failed\n", __func__, __LINE__);
goto fail_ioremap;
if (!spu_pdata(spu)->shadow) {
pr_debug("%s:%d: ioremap shadow failed\n", __func__, __LINE__);
goto fail_ioremap;
@@
-230,19
+230,19
@@
static int __init setup_interrupts(struct spu *spu)
{
int result;
{
int result;
- result = ps3_
alloc_spe_irq
(PS3_BINDING_CPU_ANY, spu_pdata(spu)->spe_id,
+ result = ps3_
spe_irq_setup
(PS3_BINDING_CPU_ANY, spu_pdata(spu)->spe_id,
0, &spu->irqs[0]);
if (result)
goto fail_alloc_0;
0, &spu->irqs[0]);
if (result)
goto fail_alloc_0;
- result = ps3_
alloc_spe_irq
(PS3_BINDING_CPU_ANY, spu_pdata(spu)->spe_id,
+ result = ps3_
spe_irq_setup
(PS3_BINDING_CPU_ANY, spu_pdata(spu)->spe_id,
1, &spu->irqs[1]);
if (result)
goto fail_alloc_1;
1, &spu->irqs[1]);
if (result)
goto fail_alloc_1;
- result = ps3_
alloc_spe_irq
(PS3_BINDING_CPU_ANY, spu_pdata(spu)->spe_id,
+ result = ps3_
spe_irq_setup
(PS3_BINDING_CPU_ANY, spu_pdata(spu)->spe_id,
2, &spu->irqs[2]);
if (result)
2, &spu->irqs[2]);
if (result)
@@
-251,9
+251,9
@@
static int __init setup_interrupts(struct spu *spu)
return result;
fail_alloc_2:
return result;
fail_alloc_2:
- ps3_
free_spe_irq
(spu->irqs[1]);
+ ps3_
spe_irq_destroy
(spu->irqs[1]);
fail_alloc_1:
fail_alloc_1:
- ps3_
free_spe_irq
(spu->irqs[0]);
+ ps3_
spe_irq_destroy
(spu->irqs[0]);
fail_alloc_0:
spu->irqs[0] = spu->irqs[1] = spu->irqs[2] = NO_IRQ;
return result;
fail_alloc_0:
spu->irqs[0] = spu->irqs[1] = spu->irqs[2] = NO_IRQ;
return result;
@@
-301,9
+301,9
@@
static int ps3_destroy_spu(struct spu *spu)
result = lv1_disable_logical_spe(spu_pdata(spu)->spe_id, 0);
BUG_ON(result);
result = lv1_disable_logical_spe(spu_pdata(spu)->spe_id, 0);
BUG_ON(result);
- ps3_
free_spe_irq
(spu->irqs[2]);
- ps3_
free_spe_irq
(spu->irqs[1]);
- ps3_
free_spe_irq
(spu->irqs[0]);
+ ps3_
spe_irq_destroy
(spu->irqs[2]);
+ ps3_
spe_irq_destroy
(spu->irqs[1]);
+ ps3_
spe_irq_destroy
(spu->irqs[0]);
spu->irqs[0] = spu->irqs[1] = spu->irqs[2] = NO_IRQ;
spu->irqs[0] = spu->irqs[1] = spu->irqs[2] = NO_IRQ;