Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 435e0b2b authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras
Browse files

[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: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Acked-by: default avatarGeoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent bff8dde8

arch/powerpc/platforms/ps3/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

arch/powerpc/platforms/ps3/system-bus.c

+3 −3
Original line number Diff line number Diff line
@@ -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,