Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=435e0b2b165bcac86eeddf675383070f60587cbb
Commit:     435e0b2b165bcac86eeddf675383070f60587cbb
Parent:     bff8dde8fb0ee9429837051b6054d770755d6e7f
Author:     Stephen Rothwell <[EMAIL PROTECTED]>
AuthorDate: Fri May 11 15:42:44 2007 +1000
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Sat May 12 11:32:47 2007 +1000

    [POWERPC] Trivial ps3 warning fixes
    
    Fixes warnings:
    
    arch/powerpc/platforms/ps3/system-bus.c: In function 'ps3_map_sg':
    arch/powerpc/platforms/ps3/system-bus.c:278: warning: unused variable 'i'
    arch/powerpc/platforms/ps3/system-bus.c:277: warning: unused variable 'dev'
    arch/powerpc/platforms/ps3/setup.c:103: warning: 'prealloc' defined but not 
used
    
    Signed-off-by: Stephen Rothwell <[EMAIL PROTECTED]>
    Acked-by: Geoff Levand <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 arch/powerpc/platforms/ps3/setup.c      |    2 +-
 arch/powerpc/platforms/ps3/system-bus.c |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/powerpc/platforms/ps3/setup.c 
b/arch/powerpc/platforms/ps3/setup.c
index c989493..9353967 100644
--- a/arch/powerpc/platforms/ps3/setup.c
+++ b/arch/powerpc/platforms/ps3/setup.c
@@ -99,6 +99,7 @@ static void ps3_panic(char *str)
        while(1);
 }
 
+#ifdef CONFIG_FB_PS3
 static void prealloc(struct ps3_prealloc *p)
 {
        if (!p->size)
@@ -115,7 +116,6 @@ static void prealloc(struct ps3_prealloc *p)
               p->address);
 }
 
-#ifdef CONFIG_FB_PS3
 struct ps3_prealloc ps3fb_videomemory = {
     .name = "ps3fb videomemory",
     .size = CONFIG_FB_PS3_DEFAULT_SIZE_M*1024*1024,
diff --git a/arch/powerpc/platforms/ps3/system-bus.c 
b/arch/powerpc/platforms/ps3/system-bus.c
index 3c48cce..6bda510 100644
--- a/arch/powerpc/platforms/ps3/system-bus.c
+++ b/arch/powerpc/platforms/ps3/system-bus.c
@@ -274,13 +274,13 @@ static void ps3_unmap_single(struct device *_dev, 
dma_addr_t dma_addr,
 static int ps3_map_sg(struct device *_dev, struct scatterlist *sg, int nents,
        enum dma_data_direction direction)
 {
-       struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);
-       int i;
-
 #if defined(CONFIG_PS3_DYNAMIC_DMA)
        BUG_ON("do");
        return -EPERM;
 #else
+       struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);
+       int i;
+
        for (i = 0; i < nents; i++, sg++) {
                int result = ps3_dma_map(dev->d_region,
                        page_to_phys(sg->page) + sg->offset, sg->length,
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to