xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spi: fsl-espi: remove remaining usage of struct fsl_spi_platform_data

Browse Source 
Use master->num_chipselect directly instead of pdata->max_chipselect.
In this context let of_fsl_espi_get_chipselects return max_chipselect.

This change allows us to get rid of struct fsl_spi_platform_data
completely in the fsl-espi driver.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Heiner Kallweit
2016-11-13 14:36:39 +01:00
committed by Mark Brown
parent 2808f778de
commit 7454346b0c
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/spi/spi-fsl-espi.c
View File

@@ -573,9 +573,8 @@ static size_t fsl_espi_max_message_size(struct spi_device *spi)
} }
static int fsl_espi_probe(struct device *dev, struct resource *mem, static int fsl_espi_probe(struct device *dev, struct resource *mem,
unsigned int irq) unsigned int irq, unsigned int num_cs)
{ {
struct fsl_spi_platform_data *pdata = dev_get_platdata(dev);
struct spi_master *master; struct spi_master *master;
struct mpc8xxx_spi *mpc8xxx_spi; struct mpc8xxx_spi *mpc8xxx_spi;
struct device_node *nc; struct device_node *nc;
@@ -597,6 +596,7 @@ static int fsl_espi_probe(struct device *dev, struct resource *mem,
master->transfer_one_message = fsl_espi_do_one_msg; master->transfer_one_message = fsl_espi_do_one_msg;
master->auto_runtime_pm = true; master->auto_runtime_pm = true;
master->max_message_size = fsl_espi_max_message_size; master->max_message_size = fsl_espi_max_message_size;
master->num_chipselect = num_cs;
mpc8xxx_spi = spi_master_get_devdata(master); mpc8xxx_spi = spi_master_get_devdata(master);
spin_lock_init(&mpc8xxx_spi->lock); spin_lock_init(&mpc8xxx_spi->lock);
@@ -636,7 +636,7 @@ static int fsl_espi_probe(struct device *dev, struct resource *mem,
for_each_available_child_of_node(master->dev.of_node, nc) { for_each_available_child_of_node(master->dev.of_node, nc) {
/* get chip select */ /* get chip select */
ret = of_property_read_u32(nc, "reg", &cs); ret = of_property_read_u32(nc, "reg", &cs);
if (ret || cs >= pdata->max_chipselect) if (ret || cs >= num_cs)
continue; continue;
csmode = CSMODE_INIT_VAL; csmode = CSMODE_INIT_VAL;
@@ -695,19 +695,16 @@ err_probe:
static int of_fsl_espi_get_chipselects(struct device *dev) static int of_fsl_espi_get_chipselects(struct device *dev)
{ {
struct device_node *np = dev->of_node; struct device_node *np = dev->of_node;
struct fsl_spi_platform_data *pdata = dev_get_platdata(dev);
u32 num_cs; u32 num_cs;
int ret; int ret;
ret = of_property_read_u32(np, "fsl,espi-num-chipselects", &num_cs); ret = of_property_read_u32(np, "fsl,espi-num-chipselects", &num_cs);
if (ret) { if (ret) {
dev_err(dev, "No 'fsl,espi-num-chipselects' property\n"); dev_err(dev, "No 'fsl,espi-num-chipselects' property\n");
return -EINVAL; return 0;
} }
pdata->max_chipselect = num_cs; return num_cs;
return 0;
} }
static int of_fsl_espi_probe(struct platform_device *ofdev) static int of_fsl_espi_probe(struct platform_device *ofdev)
@@ -715,16 +712,16 @@ static int of_fsl_espi_probe(struct platform_device *ofdev)
struct device *dev = &ofdev->dev; struct device *dev = &ofdev->dev;
struct device_node *np = ofdev->dev.of_node; struct device_node *np = ofdev->dev.of_node;
struct resource mem; struct resource mem;
unsigned int irq; unsigned int irq, num_cs;
int ret; int ret;
ret = of_mpc8xxx_spi_probe(ofdev); ret = of_mpc8xxx_spi_probe(ofdev);
if (ret) if (ret)
return ret; return ret;
ret = of_fsl_espi_get_chipselects(dev); num_cs = of_fsl_espi_get_chipselects(dev);
if (ret) if (!num_cs)
return ret; return -EINVAL;
ret = of_address_to_resource(np, 0, &mem); ret = of_address_to_resource(np, 0, &mem);
if (ret) if (ret)
@@ -734,7 +731,7 @@ static int of_fsl_espi_probe(struct platform_device *ofdev)
if (!irq) if (!irq)
return -EINVAL; return -EINVAL;
return fsl_espi_probe(dev, &mem, irq); return fsl_espi_probe(dev, &mem, irq, num_cs);
} }
static int of_fsl_espi_remove(struct platform_device *dev) static int of_fsl_espi_remove(struct platform_device *dev)
@@ -765,7 +762,6 @@ static int of_fsl_espi_suspend(struct device *dev)
static int of_fsl_espi_resume(struct device *dev) static int of_fsl_espi_resume(struct device *dev)
{ {
struct fsl_spi_platform_data *pdata = dev_get_platdata(dev);
struct spi_master *master = dev_get_drvdata(dev); struct spi_master *master = dev_get_drvdata(dev);
struct mpc8xxx_spi *mpc8xxx_spi; struct mpc8xxx_spi *mpc8xxx_spi;
u32 regval; u32 regval;
@@ -780,7 +776,7 @@ static int of_fsl_espi_resume(struct device *dev)
fsl_espi_write_reg(mpc8xxx_spi, ESPI_SPIE, 0xffffffff); fsl_espi_write_reg(mpc8xxx_spi, ESPI_SPIE, 0xffffffff);
/* Init eSPI CS mode register */ /* Init eSPI CS mode register */
for (i = 0; i < pdata->max_chipselect; i++) for (i = 0; i < master->num_chipselect; i++)
fsl_espi_write_reg(mpc8xxx_spi, ESPI_SPMODEx(i), fsl_espi_write_reg(mpc8xxx_spi, ESPI_SPMODEx(i),
CSMODE_INIT_VAL); CSMODE_INIT_VAL);