evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

spi: No need to assign dummy value in spi_unregister_controller()

Browse source 
[ Upstream commit ebc37af5e0a134355ea2b62ed4141458bdbd5389 ]

The device_for_each_child() doesn't require the returned value to be checked.
Thus, drop the dummy variable completely and have no warning anymore:

drivers/spi/spi.c: In function ‘spi_unregister_controller’:
drivers/spi/spi.c:2480:6: warning: variable ‘dummy’ set but not used [-Wunused-but-set-variable]
  int dummy;
      ^~~~~

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Andy Shevchenko 2019-06-15 20:41:35 +03:00 • committed by Greg Kroah-Hartman
parent 54000d2e15
commit fccbb6523d
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/spi/spi.c
View file

@ -1917,8 +1917,6 @@ static int __unregister(struct device *dev, void *null)
*/ */
void spi_unregister_master(struct spi_master *master) void spi_unregister_master(struct spi_master *master)
{ {
int dummy;
if (master->queued) { if (master->queued) {
if (spi_destroy_queue(master)) if (spi_destroy_queue(master))
dev_err(&master->dev, "queue remove failed\n"); dev_err(&master->dev, "queue remove failed\n");
@ -1928,7 +1926,7 @@ void spi_unregister_master(struct spi_master *master)
list_del(&master->list); list_del(&master->list);
mutex_unlock(&board_lock); mutex_unlock(&board_lock);
dummy = device_for_each_child(&master->dev, NULL, __unregister); device_for_each_child(&master->dev, NULL, __unregister);
device_unregister(&master->dev); device_unregister(&master->dev);
} }
EXPORT_SYMBOL_GPL(spi_unregister_master); EXPORT_SYMBOL_GPL(spi_unregister_master);