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

Commit 8e6c81fe authored by Andrew Victor's avatar Andrew Victor Committed by Russell King
Browse files

[ARM] 5297/1: [KS8695] Fix two compile-time warnings 



Fix two warnings when compiling for the KS8695 processor.

arch/arm/include/asm/dma-mapping.h: In function 'dma_to_virt':
arch/arm/include/asm/dma-mapping.h:40: warning: return makes pointer
from integer without a cast

Section mismatch in reference from the function pcibios_fixup_bus() to
the (unknown reference) .devinit.text:(unknown)
The function pcibios_fixup_bus() references
the (unknown reference) __devinit (unknown).
This is often because pcibios_fixup_bus lacks a __devinit
annotation or the annotation of (unknown) is wrong.

Signed-off-by: default avatarAndrew Victor <linux@maxim.org.za>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 8d163b3f

arch/arm/mach-ks8695/include/mach/memory.h

+2 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ 
/* Platform-bus mapping */

extern struct bus_type platform_bus_type;

#define is_lbus_device(dev)		(dev && dev->bus == &platform_bus_type)

#define __arch_dma_to_virt(dev, x)	({ is_lbus_device(dev) ? \

					__phys_to_virt(x) : __bus_to_virt(x); })

#define __arch_dma_to_virt(dev, x)	({ (void *) (is_lbus_device(dev) ? \

					__phys_to_virt(x) : __bus_to_virt(x)); })

#define __arch_virt_to_dma(dev, x)	({ is_lbus_device(dev) ? \

					(dma_addr_t)__virt_to_phys(x) : (dma_addr_t)__virt_to_bus(x); })

#define __arch_page_to_dma(dev, x)	__arch_virt_to_dma(dev, page_address(x))

arch/arm/mach-ks8695/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static struct pci_ops ks8695_pci_ops = { 
	.write	= ks8695_pci_writeconfig,

};



static struct pci_bus *ks8695_pci_scan_bus(int nr, struct pci_sys_data *sys)

static struct pci_bus* __init ks8695_pci_scan_bus(int nr, struct pci_sys_data *sys)

{

	return pci_scan_bus(sys->busnr, &ks8695_pci_ops, sys);

}