From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jagan Teki Date: Thu, 26 Nov 2015 17:34:07 +0530 Subject: [U-Boot] [PATCH v7 23/34] sf: probe: Minor cleanup In-Reply-To: <1448539458-14306-1-git-send-email-jteki@openedev.com> References: <1448539458-14306-1-git-send-email-jteki@openedev.com> Message-ID: <1448539458-14306-24-git-send-email-jteki@openedev.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de - Use static for file-scope function - Remove unneeded header file - Use spi instead of slave notation for spi_slave {} Reviewed-by: Heiko Schocher Signed-off-by: Jagan Teki --- drivers/mtd/spi/sf_probe.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c index 51a0c07..17281bd 100644 --- a/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c @@ -26,7 +26,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; @@ -108,24 +108,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_priv(dev); - struct spi_slave *slave = dev_get_parent_priv(dev); + struct spi_slave *spi = dev_get_parent_priv(dev); struct spi_flash *flash; int ret; flash = dev_get_uclass_priv(dev); 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; @@ -146,9 +146,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; } -- 1.9.1