spi: mpc512x-psc: Remove redundant code to get bus_num from DT
PATCH 1/1 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 Axel Lin <[email protected]>
--- drivers/spi/spi-mpc512x-psc.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-)
drivers/spi/spi-mpc512x-psc.c +2 -14
@@ -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)
Signature · 8 lines
1.8.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 5 lines · Axel Lin
For DT case, spi core will call
of_alias_get_id()and setmaster->bus_numif it was not set.Signed-off-by Axel Lin <[email protected]>
Tested-by Gerhard Sittig <[email protected]>
virtually yours
Gerhard Sittig
Signature · 7 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr. 5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: [email protected] -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Mark Brown
AppliedQuoted 2 lines · Axel Lin
For DT case, spi core will call
of_alias_get_id()and setmaster->bus_numif it was not set.
Applied, thanks.