From patchwork Tue Oct 18 11:27:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 683645 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3sytBT2YYzz9ryn for ; Tue, 18 Oct 2016 22:29:05 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759644AbcJRL2Y (ORCPT ); Tue, 18 Oct 2016 07:28:24 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:53904 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758716AbcJRL16 (ORCPT ); Tue, 18 Oct 2016 07:27:58 -0400 Received: from duckbill-v2-sdk.fritz.box ([109.104.48.177]) by mrelayeu.kundenserver.de (mreue004) with ESMTPSA (Nemesis) id 0MURRH-1cMgPG02gl-00RIhk; Tue, 18 Oct 2016 13:27:49 +0200 From: Stefan Wahren To: "David S. Miller" , Greg Kroah-Hartman , Jiri Slaby Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Stefan Wahren Subject: [PATCH v3 net-next 3/8] net: qualcomm: move qcaspi_tx_cmd to qca_spi.c Date: Tue, 18 Oct 2016 13:27:29 +0200 Message-Id: <1476790054-27174-4-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1476790054-27174-1-git-send-email-stefan.wahren@i2se.com> References: <1476790054-27174-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V03:K0:v3bBA9HF8oNAIY+28VEibbsszeTlCqP1mJ585Z5oBaN5Ii30KA2 Rry0Y2B9PlqJublki9B7eYfPc1oRvUR/jGIUv5lPwkB+VrrPdPB8a+ZSXb/sadgH3cw2WtK PTD0J91kjBMWaa7yEfB8zJlk//Bi7JbZN/8JEO/ZVhCqpZx9+CldF/Fo9NloM0TQDoB+0YV AiLNcoXl6hpqEwrkvYrbw== X-UI-Out-Filterresults: notjunk:1; V01:K0:gg0LDyO3DpY=:wMNTqm7cQxOOMG/c7GamxR fFK6Upv1hTDMWgj6aI+yWgtfFsdtwvRIsBqrHSy7CFERV37Oqbc6xGT+fNKHzjLHZAHtSgaBp cPBlhfUlMfPWmdN7mvBSwGu/0lyfWTkhf1GvHw/BMqHAXQhklre6bi6iygcMQhPSV8b7wH1e/ YsRUt8Vp3tA5qK9cxHpfUsIUwvwoxIAlPrQYhxE4C84BBCH6qNZGfGdnUW93vqK5J9kg8OhuI YstI8DR27IJWdrpIRNjn/AXTzj8u3O8UI7vuPlVKpZA9OR6h9kWiqkqpz5LiflaedQAxr4NU8 9egoU7IzPaOLHDY5qpeKw1ZDLiv8GatR8YBhzMXMIFzXsVcNbcpAsdMLU1eOZU2gp81HZe8ie LpfZVnPSleBId3iqrLZSnlcuMvD2lsp0IcqYbgn5GsSkvFVGg4sofWO9djpSfzlbh3yJrJrBm AL0e/tIV0axAdtSXiWCV7jCrX58pePkRgFSBGH7CuSDkvzkgFbkqXpfURt0n6sY6BP2ZQQpIl +HapXIFhLghIg4CKopYYZ2ypogeq5sMbyOuliFMcqSRJYCyOTKgFmOCwh1w4h1TirsHCmA/Uw JPz6VouLTtmAPjFjUT+JCNXtuZKbUJ3kJG5z5waWaujxs2YFnrbe+A0wzHb8u+eDH4Vv6odwc 8uNDvrgb/SMK0+x2K3n7PjJuwjdjK1LG/DglG0q8si0jHEJNdjQCJLN5lkH7sWoMvv1M= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The function qcaspi_tx_cmd() is only called from qca_spi.c. So we better move it there. Signed-off-by: Stefan Wahren --- drivers/net/ethernet/qualcomm/qca_7k.c | 24 ------------------------ drivers/net/ethernet/qualcomm/qca_7k.h | 1 - drivers/net/ethernet/qualcomm/qca_spi.c | 24 ++++++++++++++++++++++++ 3 files changed, 24 insertions(+), 25 deletions(-) diff --git a/drivers/net/ethernet/qualcomm/qca_7k.c b/drivers/net/ethernet/qualcomm/qca_7k.c index 557d53c..aa90a1d 100644 --- a/drivers/net/ethernet/qualcomm/qca_7k.c +++ b/drivers/net/ethernet/qualcomm/qca_7k.c @@ -119,27 +119,3 @@ qcaspi_write_register(struct qcaspi *qca, u16 reg, u16 value) return ret; } - -int -qcaspi_tx_cmd(struct qcaspi *qca, u16 cmd) -{ - __be16 tx_data; - struct spi_message *msg = &qca->spi_msg1; - struct spi_transfer *transfer = &qca->spi_xfer1; - int ret; - - tx_data = cpu_to_be16(cmd); - transfer->len = sizeof(tx_data); - transfer->tx_buf = &tx_data; - transfer->rx_buf = NULL; - - ret = spi_sync(qca->spi_dev, msg); - - if (!ret) - ret = msg->status; - - if (ret) - qcaspi_spi_error(qca); - - return ret; -} diff --git a/drivers/net/ethernet/qualcomm/qca_7k.h b/drivers/net/ethernet/qualcomm/qca_7k.h index 1cad851..b390b1f 100644 --- a/drivers/net/ethernet/qualcomm/qca_7k.h +++ b/drivers/net/ethernet/qualcomm/qca_7k.h @@ -67,6 +67,5 @@ void qcaspi_spi_error(struct qcaspi *qca); int qcaspi_read_register(struct qcaspi *qca, u16 reg, u16 *result); int qcaspi_write_register(struct qcaspi *qca, u16 reg, u16 value); -int qcaspi_tx_cmd(struct qcaspi *qca, u16 cmd); #endif /* _QCA_7K_H */ diff --git a/drivers/net/ethernet/qualcomm/qca_spi.c b/drivers/net/ethernet/qualcomm/qca_spi.c index 6e2add9..5bcac62 100644 --- a/drivers/net/ethernet/qualcomm/qca_spi.c +++ b/drivers/net/ethernet/qualcomm/qca_spi.c @@ -192,6 +192,30 @@ qcaspi_read_legacy(struct qcaspi *qca, u8 *dst, u32 len) return len; } +int +qcaspi_tx_cmd(struct qcaspi *qca, u16 cmd) +{ + __be16 tx_data; + struct spi_message *msg = &qca->spi_msg1; + struct spi_transfer *transfer = &qca->spi_xfer1; + int ret; + + tx_data = cpu_to_be16(cmd); + transfer->len = sizeof(tx_data); + transfer->tx_buf = &tx_data; + transfer->rx_buf = NULL; + + ret = spi_sync(qca->spi_dev, msg); + + if (!ret) + ret = msg->status; + + if (ret) + qcaspi_spi_error(qca); + + return ret; +} + static int qcaspi_tx_frame(struct qcaspi *qca, struct sk_buff *skb) {