From patchwork Sat Sep 12 16:07:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 7166841 Return-Path: X-Original-To: patchwork-linux-spi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id F0B29BEEC1 for ; Sat, 12 Sep 2015 16:08:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2357420806 for ; Sat, 12 Sep 2015 16:08:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 116F420805 for ; Sat, 12 Sep 2015 16:08:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751554AbbILQIg (ORCPT ); Sat, 12 Sep 2015 12:08:36 -0400 Received: from arrakis.dune.hu ([78.24.191.176]:59489 "EHLO arrakis.dune.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752004AbbILQIg (ORCPT ); Sat, 12 Sep 2015 12:08:36 -0400 Received: from localhost (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 6FDF628C11A; Sat, 12 Sep 2015 18:07:20 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Virus-Scanned: at arrakis.dune.hu Received: from localhost.localdomain (dslb-088-073-016-160.088.073.pools.vodafone-ip.de [88.73.16.160]) by arrakis.dune.hu (Postfix) with ESMTPSA id 501E828C12D; Sat, 12 Sep 2015 18:06:30 +0200 (CEST) From: Jonas Gorski To: linux-spi@vger.kernel.org, linux-mips@linux-mips.org Cc: Mark Brown , Ralf Baechle , florian@openwrt.org Subject: [PATCH V2 3/6] spi/bcm63xx: hardcode busnum to 0 Date: Sat, 12 Sep 2015 18:07:00 +0200 Message-Id: <1442074023-29840-4-git-send-email-jogo@openwrt.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1442074023-29840-1-git-send-email-jogo@openwrt.org> References: <1442074023-29840-1-git-send-email-jogo@openwrt.org> Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We always pass 0 as the spi bus number, so we might as well hard code it. Signed-off-by: Jonas Gorski --- v1 -> v2 * remove the platform data member as well. arch/mips/bcm63xx/dev-spi.c | 4 +--- arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h | 1 - drivers/spi/spi-bcm63xx.c | 3 ++- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/mips/bcm63xx/dev-spi.c b/arch/mips/bcm63xx/dev-spi.c index 438df08..b475bc1 100644 --- a/arch/mips/bcm63xx/dev-spi.c +++ b/arch/mips/bcm63xx/dev-spi.c @@ -53,9 +53,7 @@ static struct resource spi_resources[] = { }, }; -static struct bcm63xx_spi_pdata spi_pdata = { - .bus_num = 0, -}; +static struct bcm63xx_spi_pdata spi_pdata; static struct platform_device bcm63xx_spi_device = { .name = "bcm63xx-spi", diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h index 40dab9d..07c6098 100644 --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h @@ -11,7 +11,6 @@ struct bcm63xx_spi_pdata { unsigned int fifo_size; unsigned int msg_type_shift; unsigned int msg_ctl_width; - int bus_num; }; enum bcm63xx_regs_spi { diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c index a997c64..c1364a8 100644 --- a/drivers/spi/spi-bcm63xx.c +++ b/drivers/spi/spi-bcm63xx.c @@ -32,6 +32,7 @@ #define BCM63XX_SPI_MAX_PREPEND 15 #define BCM63XX_SPI_MAX_CS 8 +#define BCM63XX_SPI_BUS_NUM 0 struct bcm63xx_spi { struct completion done; @@ -369,7 +370,7 @@ static int bcm63xx_spi_probe(struct platform_device *pdev) goto out_err; } - master->bus_num = pdata->bus_num; + master->bus_num = BCM63XX_SPI_BUS_NUM; master->num_chipselect = BCM63XX_SPI_MAX_CS; master->transfer_one_message = bcm63xx_spi_transfer_one; master->mode_bits = MODEBITS;