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

Commit 7822eee1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'warning-fixes' into next/fixes-non-critical 



These are fixes for compiler warnings that for the most
part were introduced during the 3.8 cycle but are otherwise
harmless.

* warning-fixes:
  scripts/sortextable: silence script output
  ARM: s3c: i2c: add platform_device forward declaration
  ARM: mvebu: allow selecting mvebu without Armada XP
  ARM: pick Versatile by default for !MMU
  ARM: integrator: fix build with INTEGRATOR_AP off
  ARM: integrator/versatile: fix NOMMU warnings
  ARM: sa1100: don't warn about mach/ide.h
  ARM: shmobile: fix defconfig warning on CONFIG_USB
  ARM: w90x900: fix legacy assembly syntax
  ARM: samsung: fix assembly syntax for new gas
  ARM: disable virt_to_bus/virt_to_bus almost everywhere

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 0e55f0b0 8c0c774d

arch/arm/Kconfig

+6 −1
Original line number Diff line number Diff line
@@ -261,7 +261,8 @@ config MMU 
#

choice

	prompt "ARM system type"

	default ARCH_MULTIPLATFORM

	default ARCH_VERSATILE if !MMU

	default ARCH_MULTIPLATFORM if MMU



config ARCH_MULTIPLATFORM

	bool "Allow multiple platforms to be selected"
@@ -1450,6 +1451,10 @@ config ISA_DMA 
	bool

	select ISA_DMA_API



config ARCH_NO_VIRT_TO_BUS

	def_bool y

	depends on !ARCH_RPC && !ARCH_NETWINDER && !ARCH_SHARK



# Select ISA DMA interface

config ISA_DMA_API

	bool

arch/arm/configs/marzen_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ CONFIG_USB=y 
CONFIG_USB_RCAR_PHY=y

CONFIG_MMC=y

CONFIG_MMC_SDHI=y

CONFIG_USB=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_OHCI_HCD_PLATFORM=y

arch/arm/configs/shark_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ CONFIG_PARTITION_ADVANCED=y 
CONFIG_NLS_CODEPAGE_437=m

CONFIG_NLS_CODEPAGE_850=m

CONFIG_NLS_ISO8859_1=m

# CONFIG_ENABLE_WARN_DEPRECATED is not set

# CONFIG_ENABLE_MUST_CHECK is not set

CONFIG_DEBUG_KERNEL=y

# CONFIG_SCHED_DEBUG is not set

arch/arm/include/asm/dma.h

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ extern void set_dma_sg(unsigned int chan, struct scatterlist *sg, int nr_sg); 
 */

extern void __set_dma_addr(unsigned int chan, void *addr);

#define set_dma_addr(chan, addr)				\

	__set_dma_addr(chan, bus_to_virt(addr))

	__set_dma_addr(chan, (void *)__bus_to_virt(addr))



/* Set the DMA byte count for this channel

 *

arch/arm/include/asm/memory.h

+2 −0
Original line number Diff line number Diff line
@@ -245,6 +245,7 @@ static inline void *phys_to_virt(phys_addr_t x) 
#define __bus_to_pfn(x)	__phys_to_pfn(x)

#endif



#ifdef CONFIG_VIRT_TO_BUS

static inline __deprecated unsigned long virt_to_bus(void *x)

{

	return __virt_to_bus((unsigned long)x);
@@ -254,6 +255,7 @@ static inline __deprecated void *bus_to_virt(unsigned long x) 
{

	return (void *)__bus_to_virt(x);

}

#endif



/*

 * Conversion between a struct page and a physical address.