| Message ID | 1444679655-30349-6-git-send-email-jteki@openedev.com |
|---|---|
| State | Superseded |
| Delegated to: | Jagannadha Sutradharudu Teki |
| Headers | show |
Hello Jagan, Am 12.10.2015 um 21:54 schrieb Jagan Teki: > - Use static for file-scope function > - Remove unneeded header file > - Use spi instead of slave notation for spi_slave {} > > Signed-off-by: Jagan Teki <jteki@openedev.com> > --- > drivers/mtd/spi/sf_probe.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) Reviewed-by: Heiko Schocher <hs@denx.de> bye, Heiko > > diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c > index 60abaf2..112ab27 100644 > --- a/drivers/mtd/spi/sf_probe.c > +++ b/drivers/mtd/spi/sf_probe.c > @@ -24,7 +24,7 @@ struct spi_flash_priv { > }; > > #ifndef CONFIG_DM_SPI_FLASH > -struct spi_flash *spi_flash_probe_tail(struct spi_slave *bus) > +static struct spi_flash *spi_flash_probe_tail(struct spi_slave *bus) > { > struct spi_flash_priv *priv; > struct spi_flash *flash; > @@ -106,24 +106,24 @@ void spi_flash_free(struct spi_flash *flash) > > #else /* defined CONFIG_DM_SPI_FLASH */ > > -int spi_flash_std_probe(struct udevice *dev) > +static int spi_flash_std_probe(struct udevice *dev) > { > struct spi_flash_priv *priv = dev_get_uclass_priv(dev); > - struct spi_slave *slave = dev_get_parentdata(dev); > + struct spi_slave *spi = dev_get_parentdata(dev); > struct spi_flash *flash; > int ret; > > flash = &priv->flash; > flash->mtd = &priv->mtd; > > - flash->spi = slave; > + flash->spi = spi; > flash->priv = priv; > > priv->mtd.priv = flash; > flash->dev = dev; > > /* Claim spi bus */ > - ret = spi_claim_bus(slave); > + ret = spi_claim_bus(spi); > if (ret) { > debug("SF: Failed to claim SPI bus: %d\n", ret); > return ret; > @@ -144,9 +144,9 @@ int spi_flash_std_probe(struct udevice *dev) > return ret; > > err_mtd: > - spi_free_slave(slave); > + spi_free_slave(spi); > err_scan: > - spi_release_bus(slave); > + spi_release_bus(spi); > return ret; > } > >
diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c index 60abaf2..112ab27 100644 --- a/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c @@ -24,7 +24,7 @@ struct spi_flash_priv { }; #ifndef CONFIG_DM_SPI_FLASH -struct spi_flash *spi_flash_probe_tail(struct spi_slave *bus) +static struct spi_flash *spi_flash_probe_tail(struct spi_slave *bus) { struct spi_flash_priv *priv; struct spi_flash *flash; @@ -106,24 +106,24 @@ void spi_flash_free(struct spi_flash *flash) #else /* defined CONFIG_DM_SPI_FLASH */ -int spi_flash_std_probe(struct udevice *dev) +static int spi_flash_std_probe(struct udevice *dev) { struct spi_flash_priv *priv = dev_get_uclass_priv(dev); - struct spi_slave *slave = dev_get_parentdata(dev); + struct spi_slave *spi = dev_get_parentdata(dev); struct spi_flash *flash; int ret; flash = &priv->flash; flash->mtd = &priv->mtd; - flash->spi = slave; + flash->spi = spi; flash->priv = priv; priv->mtd.priv = flash; flash->dev = dev; /* Claim spi bus */ - ret = spi_claim_bus(slave); + ret = spi_claim_bus(spi); if (ret) { debug("SF: Failed to claim SPI bus: %d\n", ret); return ret; @@ -144,9 +144,9 @@ int spi_flash_std_probe(struct udevice *dev) return ret; err_mtd: - spi_free_slave(slave); + spi_free_slave(spi); err_scan: - spi_release_bus(slave); + spi_release_bus(spi); return ret; }
- Use static for file-scope function - Remove unneeded header file - Use spi instead of slave notation for spi_slave {} Signed-off-by: Jagan Teki <jteki@openedev.com> --- drivers/mtd/spi/sf_probe.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)