Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

spi: bitbang: Make spi_bitbang_stop() return void

spi_bitbang_stop() never fails, so make it return void.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

authored by

Axel Lin and committed by
Mark Brown
d9721ae1 38dbfb59

+7 -12
+1 -3
drivers/spi/spi-bitbang.c
··· 467 467 /** 468 468 * spi_bitbang_stop - stops the task providing spi communication 469 469 */ 470 - int spi_bitbang_stop(struct spi_bitbang *bitbang) 470 + void spi_bitbang_stop(struct spi_bitbang *bitbang) 471 471 { 472 472 spi_unregister_master(bitbang->master); 473 - 474 - return 0; 475 473 } 476 474 EXPORT_SYMBOL_GPL(spi_bitbang_stop); 477 475
+1 -2
drivers/spi/spi-butterfly.c
··· 309 309 static void butterfly_detach(struct parport *p) 310 310 { 311 311 struct butterfly *pp; 312 - int status; 313 312 314 313 /* FIXME this global is ugly ... but, how to quickly get from 315 314 * the parport to the "struct butterfly" associated with it? ··· 320 321 butterfly = NULL; 321 322 322 323 /* stop() unregisters child devices too */ 323 - status = spi_bitbang_stop(&pp->bitbang); 324 + spi_bitbang_stop(&pp->bitbang); 324 325 325 326 /* turn off VCC */ 326 327 parport_write_data(pp->port, 0);
+2 -3
drivers/spi/spi-gpio.c
··· 503 503 { 504 504 struct spi_gpio *spi_gpio; 505 505 struct spi_gpio_platform_data *pdata; 506 - int status; 507 506 508 507 spi_gpio = platform_get_drvdata(pdev); 509 508 pdata = dev_get_platdata(&pdev->dev); 510 509 511 510 /* stop() unregisters child devices too */ 512 - status = spi_bitbang_stop(&spi_gpio->bitbang); 511 + spi_bitbang_stop(&spi_gpio->bitbang); 513 512 514 513 if (SPI_MISO_GPIO != SPI_GPIO_NO_MISO) 515 514 gpio_free(SPI_MISO_GPIO); ··· 517 518 gpio_free(SPI_SCK_GPIO); 518 519 spi_master_put(spi_gpio->bitbang.master); 519 520 520 - return status; 521 + return 0; 521 522 } 522 523 523 524 MODULE_ALIAS("platform:" DRIVER_NAME);
+2 -3
drivers/spi/spi-omap-uwire.c
··· 539 539 static int uwire_remove(struct platform_device *pdev) 540 540 { 541 541 struct uwire_spi *uwire = platform_get_drvdata(pdev); 542 - int status; 543 542 544 543 // FIXME remove all child devices, somewhere ... 545 544 546 - status = spi_bitbang_stop(&uwire->bitbang); 545 + spi_bitbang_stop(&uwire->bitbang); 547 546 uwire_off(uwire); 548 547 iounmap(uwire_base); 549 - return status; 548 + return 0; 550 549 } 551 550 552 551 /* work with hotplug and coldplug */
+1 -1
include/linux/spi/spi_bitbang.h
··· 42 42 43 43 /* start or stop queue processing */ 44 44 extern int spi_bitbang_start(struct spi_bitbang *spi); 45 - extern int spi_bitbang_stop(struct spi_bitbang *spi); 45 + extern void spi_bitbang_stop(struct spi_bitbang *spi); 46 46 47 47 #endif /* __SPI_BITBANG_H */