Commit 83d09ad4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://github.com/openrisc/linux 

Pull OpenRISC fixes from Stafford Horne:

 - Compiler warning fixup for new Litex SoC driver

 - Sparse warning fixup for iounmap

* tag 'for-linus' of git://github.com/openrisc/linux:
  openrisc: io: Add missing __iomem annotation to iounmap()
  soc: litex: Fix compile warning when device tree is not configured
parents 36ada250 031c7a8c

arch/openrisc/include/asm/io.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
void __iomem *ioremap(phys_addr_t offset, unsigned long size);



#define iounmap iounmap

extern void iounmap(void *addr);

extern void iounmap(void __iomem *addr);



#include <asm-generic/io.h>

arch/openrisc/mm/ioremap.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ void __iomem *__ref ioremap(phys_addr_t addr, unsigned long size) 
}

EXPORT_SYMBOL(ioremap);



void iounmap(void *addr)

void iounmap(void __iomem *addr)

{

	/* If the page is from the fixmap pool then we just clear out

	 * the fixmap mapping.

drivers/soc/litex/litex_soc_ctrl.c

+2 −1
Original line number Diff line number Diff line
@@ -140,12 +140,13 @@ struct litex_soc_ctrl_device { 
	void __iomem *base;

};



#ifdef CONFIG_OF

static const struct of_device_id litex_soc_ctrl_of_match[] = {

	{.compatible = "litex,soc-controller"},

	{},

};



MODULE_DEVICE_TABLE(of, litex_soc_ctrl_of_match);

#endif /* CONFIG_OF */



static int litex_soc_ctrl_probe(struct platform_device *pdev)

{