moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2021-01-21 18:35:02 -08:00
parent 36ada25026 031c7a8cd6
commit 83d09ad4b9
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/openrisc/include/asm/io.h
View File

@@ -31,7 +31,7 @@
void __iomem *ioremap(phys_addr_t offset, unsigned long size); void __iomem *ioremap(phys_addr_t offset, unsigned long size);
#define iounmap iounmap #define iounmap iounmap
extern void iounmap(void *addr); extern void iounmap(void __iomem *addr);
#include <asm-generic/io.h> #include <asm-generic/io.h>

2
arch/openrisc/mm/ioremap.c
View File

@@ -77,7 +77,7 @@ void __iomem *__ref ioremap(phys_addr_t addr, unsigned long size)
} }
EXPORT_SYMBOL(ioremap); 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 /* If the page is from the fixmap pool then we just clear out
* the fixmap mapping. * the fixmap mapping.

3
drivers/soc/litex/litex_soc_ctrl.c
View File

@@ -140,12 +140,13 @@ struct litex_soc_ctrl_device {
void __iomem *base; void __iomem *base;
}; };
#ifdef CONFIG_OF
static const struct of_device_id litex_soc_ctrl_of_match[] = { static const struct of_device_id litex_soc_ctrl_of_match[] = {
{.compatible = "litex,soc-controller"}, {.compatible = "litex,soc-controller"},
{}, {},
}; };
MODULE_DEVICE_TABLE(of, litex_soc_ctrl_of_match); MODULE_DEVICE_TABLE(of, litex_soc_ctrl_of_match);
#endif /* CONFIG_OF */
static int litex_soc_ctrl_probe(struct platform_device *pdev) static int litex_soc_ctrl_probe(struct platform_device *pdev)
{ {