Skip to content

Commit e15a709

Browse files
committed
Merge tag 'sunxi-drivers-for-6.4-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into soc/drivers
- remove MODULE_LICENSE from sram driver - use of_property_present() in mbus driver * tag 'sunxi-drivers-for-6.4-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: kbuild, soc: sunxi: sram: remove MODULE_LICENSE in non-modules soc: sunxi: Use of_property_present() for testing DT property presence Link: https://lore.kernel.org/r/20230408125255.GA17134@jernej-laptop Signed-off-by: Arnd Bergmann <[email protected]>
2 parents e4fa3c7 + c014377 commit e15a709

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

drivers/soc/sunxi/sunxi_mbus.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ static int sunxi_mbus_notifier(struct notifier_block *nb,
8282
* Older DTs or SoCs who are not clearly understood need to set
8383
* that DMA offset though.
8484
*/
85-
if (of_find_property(dev->of_node, "interconnects", NULL))
85+
if (of_property_present(dev->of_node, "interconnects"))
8686
return NOTIFY_DONE;
8787

8888
ret = dma_direct_set_offset(dev, PHYS_OFFSET, 0, SZ_4G);

drivers/soc/sunxi/sunxi_sram.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,4 +424,3 @@ builtin_platform_driver_probe(sunxi_sram_driver, sunxi_sram_probe);
424424

425425
MODULE_AUTHOR("Maxime Ripard <[email protected]>");
426426
MODULE_DESCRIPTION("Allwinner sunXi SRAM Controller Driver");
427-
MODULE_LICENSE("GPL");

0 commit comments

Comments
 (0)