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

Commit 3d8c8697 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

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



For DT case, spi core will call of_alias_get_id() and set master->bus_num if it
was not set.

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Tested-by: default avatarGerhard Sittig <gsi@denx.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 38dbfb59

drivers/spi/spi-mpc512x-psc.c

+2 −14
Original line number Diff line number Diff line
@@ -466,10 +466,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;
@@ -488,7 +486,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;
@@ -574,7 +571,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) {
@@ -583,16 +579,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)