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

Commit 11128b90 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'davinci-for-v4.10/drivers-2' of... 

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()
parents d09a0011 d0c7546f

drivers/bus/da8xx-mstpri.c

+1 −3
Original line number Diff line number Diff line
@@ -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;

	}

drivers/memory/da8xx-ddrctl.c

+1 −3
Original line number Diff line number Diff line
@@ -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;

	}