@@ -379,6 +379,7 @@ static int spi_gpio_probe(struct platform_device *pdev)
struct spi_master *master;
struct spi_gpio *spi_gpio;
struct spi_gpio_platform_data *pdata;
+ struct device *dev = &pdev->dev;
u16 master_flags = 0;
bool use_of = 0;
@@ -388,19 +389,19 @@ static int spi_gpio_probe(struct platform_device *pdev)
if (status > 0)
use_of = 1;
- pdata = dev_get_platdata(&pdev->dev);
+ pdata = dev_get_platdata(dev);
#ifdef GENERIC_BITBANG
if (!pdata || (!use_of && !pdata->num_chipselect))
return -ENODEV;
#endif
- master = spi_alloc_master(&pdev->dev, sizeof(*spi_gpio));
+ master = spi_alloc_master(dev, sizeof(*spi_gpio));
if (!master)
return -ENOMEM;
spi_gpio = spi_master_get_devdata(master);
- spi_gpio->cs_gpios = devm_kcalloc(&pdev->dev,
+ spi_gpio->cs_gpios = devm_kcalloc(dev,
pdata->num_chipselect,
sizeof(*spi_gpio->cs_gpios),
GFP_KERNEL);
@@ -416,7 +417,7 @@ static int spi_gpio_probe(struct platform_device *pdev)
if (pdata)
spi_gpio->pdata = *pdata;
- status = spi_gpio_request(&pdev->dev, spi_gpio,
+ status = spi_gpio_request(dev, spi_gpio,
pdata->num_chipselect, &master_flags);
if (status)
return status;
@@ -431,7 +432,7 @@ static int spi_gpio_probe(struct platform_device *pdev)
master->setup = spi_gpio_setup;
master->cleanup = spi_gpio_cleanup;
#ifdef CONFIG_OF
- master->dev.of_node = pdev->dev.of_node;
+ master->dev.of_node = dev->of_node;
#endif
spi_gpio->bitbang.master = master;
Use a local "struct device *dev" in spi_gpio_probe() for brevity. No functional change intended. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Cc: Mark Brown <broonie@kernel.org> Cc: Chris Healy <cphealy@gmail.com> Cc: linux-spi@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- drivers/spi/spi-gpio.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)