From patchwork Sat Mar 29 00:02:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Lin X-Patchwork-Id: 3907741 Return-Path: X-Original-To: patchwork-linux-spi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3D1BF9F2E8 for ; Sat, 29 Mar 2014 00:02:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6DC5E20351 for ; Sat, 29 Mar 2014 00:02:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 686142035E for ; Sat, 29 Mar 2014 00:02:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751293AbaC2ACV (ORCPT ); Fri, 28 Mar 2014 20:02:21 -0400 Received: from mail-pb0-f44.google.com ([209.85.160.44]:48277 "EHLO mail-pb0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751270AbaC2ACU (ORCPT ); Fri, 28 Mar 2014 20:02:20 -0400 Received: by mail-pb0-f44.google.com with SMTP id rp16so5669647pbb.17 for ; Fri, 28 Mar 2014 17:02:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:subject:from:to:cc:date:content-type :mime-version:content-transfer-encoding; bh=S5gah7kqLdonlKEddlv93Xi+bErVvZ0cSgArO5NYd28=; b=MspuLlisIdGtEy3eCBSAkk2S/QXISmEeA63hhdLeWtFd58I8r0tnVO2zByR8nUDUu7 budX3U+ZbjXPRpD5EIYbyK2XoLpWw1egY4KqUhNXogFuuCi3t28qwKZpXfp4wBa5cHS8 H/N2wfeQmyFaJHWxjTP2QYMgg6F/GNb6CTtlKXyzjnNPDohuCHVyfUXxVIXC4m1T7ciS BrTgPbaE53qrgHigse6bTd7rfUBWmnr62xbQBxmoB1DLyyTtyrS9pkoBztd1aw4Imffp GqpWYTskQtlg7f2u70ToiRNqD0gB0mq6yEY4pMeCarhhQb/jlrdZ7aoYV5KscawtA/JK 171g== X-Gm-Message-State: ALoCoQn2ZgWl/JCgYcCJKFV9aILC2OQHQN/BxXZkxTkbHHoSDqFtWQyvXHxgjBpkKw32l9v/r0aw X-Received: by 10.66.181.70 with SMTP id du6mr11537951pac.23.1396051339770; Fri, 28 Mar 2014 17:02:19 -0700 (PDT) Received: from [192.168.0.119] (59-115-21-222.dynamic.hinet.net. [59.115.21.222]) by mx.google.com with ESMTPSA id qw8sm27562813pbb.27.2014.03.28.17.02.16 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 28 Mar 2014 17:02:18 -0700 (PDT) Message-ID: <1396051333.18624.1.camel@phoenix> Subject: [PATCH] spi: bitbang: Make spi_bitbang_stop() return void From: Axel Lin To: Mark Brown Cc: linux-spi@vger.kernel.org Date: Sat, 29 Mar 2014 08:02:13 +0800 X-Mailer: Evolution 3.8.4-0ubuntu1 Mime-Version: 1.0 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP spi_bitbang_stop() never fails, so make it return void. Signed-off-by: Axel Lin --- drivers/spi/spi-bitbang.c | 4 +--- drivers/spi/spi-gpio.c | 5 ++--- drivers/spi/spi-omap-uwire.c | 5 ++--- include/linux/spi/spi_bitbang.h | 2 +- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/spi/spi-bitbang.c b/drivers/spi/spi-bitbang.c index 3bfdb85..dc7d2c2 100644 --- a/drivers/spi/spi-bitbang.c +++ b/drivers/spi/spi-bitbang.c @@ -466,11 +466,9 @@ EXPORT_SYMBOL_GPL(spi_bitbang_start); /** * spi_bitbang_stop - stops the task providing spi communication */ -int spi_bitbang_stop(struct spi_bitbang *bitbang) +void spi_bitbang_stop(struct spi_bitbang *bitbang) { spi_unregister_master(bitbang->master); - - return 0; } EXPORT_SYMBOL_GPL(spi_bitbang_stop); diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c index 406bbd7..0982307 100644 --- a/drivers/spi/spi-gpio.c +++ b/drivers/spi/spi-gpio.c @@ -502,13 +502,12 @@ static int spi_gpio_remove(struct platform_device *pdev) { struct spi_gpio *spi_gpio; struct spi_gpio_platform_data *pdata; - int status; spi_gpio = platform_get_drvdata(pdev); pdata = dev_get_platdata(&pdev->dev); /* stop() unregisters child devices too */ - status = spi_bitbang_stop(&spi_gpio->bitbang); + spi_bitbang_stop(&spi_gpio->bitbang); if (SPI_MISO_GPIO != SPI_GPIO_NO_MISO) gpio_free(SPI_MISO_GPIO); @@ -517,7 +516,7 @@ static int spi_gpio_remove(struct platform_device *pdev) gpio_free(SPI_SCK_GPIO); spi_master_put(spi_gpio->bitbang.master); - return status; + return 0; } MODULE_ALIAS("platform:" DRIVER_NAME); diff --git a/drivers/spi/spi-omap-uwire.c b/drivers/spi/spi-omap-uwire.c index 31ce92f..be2a2e1 100644 --- a/drivers/spi/spi-omap-uwire.c +++ b/drivers/spi/spi-omap-uwire.c @@ -516,14 +516,13 @@ static int uwire_probe(struct platform_device *pdev) static int uwire_remove(struct platform_device *pdev) { struct uwire_spi *uwire = platform_get_drvdata(pdev); - int status; // FIXME remove all child devices, somewhere ... - status = spi_bitbang_stop(&uwire->bitbang); + spi_bitbang_stop(&uwire->bitbang); uwire_off(uwire); iounmap(uwire_base); - return status; + return 0; } /* work with hotplug and coldplug */ diff --git a/include/linux/spi/spi_bitbang.h b/include/linux/spi/spi_bitbang.h index daebaba..85578d4 100644 --- a/include/linux/spi/spi_bitbang.h +++ b/include/linux/spi/spi_bitbang.h @@ -42,6 +42,6 @@ extern int spi_bitbang_setup_transfer(struct spi_device *spi, /* start or stop queue processing */ extern int spi_bitbang_start(struct spi_bitbang *spi); -extern int spi_bitbang_stop(struct spi_bitbang *spi); +extern void spi_bitbang_stop(struct spi_bitbang *spi); #endif /* __SPI_BITBANG_H */