diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-11-30 16:57:19 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-11-30 16:58:00 +0300 |
| commit | 11128b90212d70019fd84dd514ea25f4552159f1 (patch) | |
| tree | 460cdbb987f0bf247a15bae9be4f7255eb103f50 /drivers | |
| parent | d09a0011ec0d511b51d6378a071fd8d75eb27622 (diff) | |
| parent | d0c7546f6257b4680a760e3fd0dff8a7cc4600ff (diff) | |
| download | linux-11128b90212d70019fd84dd514ea25f4552159f1.tar.xz | |
Merge tag 'davinci-for-v4.10/drivers-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/drivers
Pull "DaVinci driver updates for v4.10 (part 2)" from Sekhar Nori:
Fixes for drivers already queued to prevent
section mismatch warnings introduced by them.
* tag 'davinci-for-v4.10/drivers-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
memory: da8xx-ddrctl: drop the call to of_flat_dt_get_machine_name()
bus: da8xx-mstpri: drop the call to of_flat_dt_get_machine_name()
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/bus/da8xx-mstpri.c | 4 | ||||
| -rw-r--r-- | drivers/memory/da8xx-ddrctl.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/bus/da8xx-mstpri.c b/drivers/bus/da8xx-mstpri.c index 85f0b533f8e4..063397f2c0db 100644 --- a/drivers/bus/da8xx-mstpri.c +++ b/drivers/bus/da8xx-mstpri.c @@ -16,7 +16,6 @@ #include <linux/platform_device.h> #include <linux/io.h> #include <linux/regmap.h> -#include <linux/of_fdt.h> /* * REVISIT: Linux doesn't have a good framework for the kind of performance @@ -226,8 +225,7 @@ static int da8xx_mstpri_probe(struct platform_device *pdev) prio_list = da8xx_mstpri_get_board_prio(); if (!prio_list) { - dev_err(dev, "no master priotities defined for board '%s'\n", - of_flat_dt_get_machine_name()); + dev_err(dev, "no master priorities defined for this board\n"); return -EINVAL; } diff --git a/drivers/memory/da8xx-ddrctl.c b/drivers/memory/da8xx-ddrctl.c index a20e7bbbcbe0..030afbe29d0c 100644 --- a/drivers/memory/da8xx-ddrctl.c +++ b/drivers/memory/da8xx-ddrctl.c @@ -14,7 +14,6 @@ #include <linux/module.h> #include <linux/of.h> #include <linux/of_device.h> -#include <linux/of_fdt.h> #include <linux/platform_device.h> #include <linux/io.h> @@ -117,8 +116,7 @@ static int da8xx_ddrctl_probe(struct platform_device *pdev) setting = da8xx_ddrctl_get_board_settings(); if (!setting) { - dev_err(dev, "no settings for board '%s'\n", - of_flat_dt_get_machine_name()); + dev_err(dev, "no settings defined for this board\n"); return -EINVAL; } |