From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966740AbcIZLIt (ORCPT ); Mon, 26 Sep 2016 07:08:49 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:59658 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966433AbcIZLIc (ORCPT ); Mon, 26 Sep 2016 07:08:32 -0400 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 RFC v2 net-next 3/8] net: qualcomm: move qcaspi_tx_cmd to qca_spi.c Date: Mon, 26 Sep 2016 13:08:01 +0200 Message-Id: <1474888086-514-4-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1474888086-514-1-git-send-email-stefan.wahren@i2se.com> References: <1474888086-514-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V03:K0:SVm7RO4FwpQslYNF4+d7D/uuXwUbtJSXQoeMF6SkJ1WLQsDLN+7 PoSZbMakvSDZf7yCr6hEUR/edCD3/nsWuueIIwOajZ6CLgNuN+b+b8I44iPLmlo9pno0bgx wgH/92D2GXRlRgcxOkG6Dz1H+N492yObX1ujyJoQHk43EB5ipY+6Urg+VLjOLnKTvHupHt7 FJomCbsn7cCilfWUZP2Ag== X-UI-Out-Filterresults: notjunk:1;V01:K0:ulcLnR8Te+E=:5BxHEw85Ka6BeY6aD/Sg3D AbN+wFz+/grmry8a7h7OXklXIaO04QIp55BBIdl097cxmaMWVs16MFMlctec/npHUn6tuXTLp zlXs5ZRS8lBTLdlYXT6vN76QFJLm+1dI0/lOheLhdTge4Fxdquuqip3qlqz+CzpTQHVAMPj/I Im5fqaDD/dCp0I+9K0tbp9qcDLjrLCu+x3nxZttMmne4WIb8BAFSMRH0BrPkifksc8vtCGsrf +yLkJs2LRyG8w6MkthXw11w0KlDkDcT3A6fOAkdbninY6moEb4Pg8JnHc8V/qvwWBmgR52+dM Wmt0RrrCrFKe9IzVgP142QPUJ38WKDBpNvgtxeyBqsMM8v9egSQDgxdjIhmI2f/poQBarJmTw SQV3BeS7rD3OcTCvkSCENzn1qYS4OxDuIg6hU4DVlolkBCZxW501KsUjiEbsK2FWXH7wZyvAj A1APD5DnAuJ4k0h+kS3PIK1rC57K0LgxlWxCSzgVh8jm/Qe5ytFc+BOAEapLpPJRpDXYqGv3b SDLMIvkJ/LRaNkCnk8PYGrBMRWFM0/po5a4GL2xHPs0AK16vo0AYS6oROxhI1PX29A7kw7jXw 8LlWZbVZuxN9w26DgqKZ0aKenZpbYGpGjVrULWtQxWQkBedUT1bHOja3vqrEwu7nnIK2a5XOB AqKRtEjhhIadw5YTQvNq21jk1O3PnU8+ZpD19JV8sBl+8ymiJXoN/x2/Lge/kpF8aPe8= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@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) { -- 2.1.4