diff mbox

spi: mpc512x-psc: Remove redundant code to get bus_num from DT

Message ID 1392518598.18192.3.camel@phoenix (mailing list archive)
State Accepted
Commit 3d8c869796b61f2dd7c1b84112902e199936c053
Headers show

Commit Message

Axel Lin Feb. 16, 2014, 2:43 a.m. UTC 
For DT case, spi core will call of_alias_get_id() and set master->bus_num if it
was not set.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
 drivers/spi/spi-mpc512x-psc.c | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

Comments

Gerhard Sittig Feb. 16, 2014, 2:04 p.m. UTC | #1 
On Sun, Feb 16, 2014 at 10:43 +0800, Axel Lin wrote:
> 
> For DT case, spi core will call of_alias_get_id() and set master->bus_num if it
> was not set.
> 
> Signed-off-by: Axel Lin <axel.lin@ingics.com>

Tested-by: Gerhard Sittig <gsi@denx.de>


virtually yours
Gerhard Sittig
Mark Brown Feb. 18, 2014, 2:04 a.m. UTC | #2 
On Sun, Feb 16, 2014 at 10:43:18AM +0800, Axel Lin wrote:
> For DT case, spi core will call of_alias_get_id() and set master->bus_num if it
> was not set.

Applied, thanks.
diff mbox

Patch

diff --git a/drivers/spi/spi-mpc512x-psc.c b/drivers/spi/spi-mpc512x-psc.c
index 56cead9..3822eef 100644
--- a/drivers/spi/spi-mpc512x-psc.c
+++ b/drivers/spi/spi-mpc512x-psc.c
@@ -465,10 +465,8 @@  static void mpc512x_spi_cs_control(struct spi_device *spi, bool onoff)
 	gpio_set_value(spi->cs_gpio, onoff);
 }
 
-/* bus_num is used only for the case dev->platform_data == NULL */
 static int mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr,
-					      u32 size, unsigned int irq,
-					      s16 bus_num)
+					      u32 size, unsigned int irq)
 {
 	struct fsl_spi_platform_data *pdata = dev_get_platdata(dev);
 	struct mpc512x_psc_spi *mps;
@@ -487,7 +485,6 @@  static int mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr,
 
 	if (pdata == NULL) {
 		mps->cs_control = mpc512x_spi_cs_control;
-		master->bus_num = bus_num;
 	} else {
 		mps->cs_control = pdata->cs_control;
 		master->bus_num = pdata->bus_num;
@@ -573,7 +570,6 @@  static int mpc512x_psc_spi_of_probe(struct platform_device *op)
 {
 	const u32 *regaddr_p;
 	u64 regaddr64, size64;
-	s16 id = -1;
 
 	regaddr_p = of_get_address(op->dev.of_node, 0, &size64, NULL);
 	if (!regaddr_p) {
@@ -582,16 +578,8 @@  static int mpc512x_psc_spi_of_probe(struct platform_device *op)
 	}
 	regaddr64 = of_translate_address(op->dev.of_node, regaddr_p);
 
-	/* get PSC id (0..11, used by port_config) */
-	id = of_alias_get_id(op->dev.of_node, "spi");
-	if (id < 0) {
-		dev_err(&op->dev, "no alias id for %s\n",
-			op->dev.of_node->full_name);
-		return id;
-	}
-
 	return mpc512x_psc_spi_do_probe(&op->dev, (u32) regaddr64, (u32) size64,
-				irq_of_parse_and_map(op->dev.of_node, 0), id);
+				irq_of_parse_and_map(op->dev.of_node, 0));
 }
 
 static int mpc512x_psc_spi_of_remove(struct platform_device *op)