From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934797AbdEWNNl (ORCPT ); Tue, 23 May 2017 09:13:41 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:57740 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760553AbdEWNNd (ORCPT ); Tue, 23 May 2017 09:13:33 -0400 From: Stefan Wahren To: Rob Herring , Mark Rutland , "David S. Miller" Cc: Greg Kroah-Hartman , Jiri Slaby , Lino Sanfilippo , Jakub Kicinski , devicetree@vger.kernel.org, netdev@vger.kernel.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, Stefan Wahren Subject: [PATCH v6 net-next 08/17] net: qualcomm: move qcaspi_tx_cmd to qca_spi.c Date: Tue, 23 May 2017 15:12:44 +0200 Message-Id: <1495545173-22150-9-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1495545173-22150-1-git-send-email-stefan.wahren@i2se.com> References: <1495545173-22150-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V03:K0:EjJ5BroG1ltfE1z3KW9tHEkdRFpQOkjyhu5+PpxItqpZHAEgVIf JXJsYA3Aj6CNAp6CfHjzRE8itAW/jo1r7+U3x/DrAalD09cntiY9Pou0+L6zy2sRNubxtA6 qTA1Fjv6TOB+9AcCFpD079Qcb5ojk7S0J2dvlxjOlAv/WfXyMrf/+6qU0CgcOvWkwuB8BEa ZKK02/yk8oRZ7B4hzTF/Q== X-UI-Out-Filterresults: notjunk:1;V01:K0:FJVxfYOZdXk=:h7h2/AtG9k6Yv+VXAdChjo lcibOUX8Q4C3u+bzkbJmlhLOimdtMgCVNRGzWbrYdeMbXaAmCKACaIKWAD+68jU6xn0mmxzdJ q0ZQki5gCWrexcyn08eWC42gYy8qdFYeTu/Z8TRc1xIvSOAMfm2ZCUoSbnrKT3G3vzIvZHapW KvuBVzIuCoiCUyH5aid57P1rHD41NZjbhTMJGuukc8V0us2L6+xc70CUs3Rm1SwMLaMEgyDlk svTI/xlrbIhwlatYC5ZVFBWtluOWh/q1S1ZZgp6XnmkIqUWRmfGE3Cp+EzGUd8UDuUeQl8XKW qKqyDN3DMKjWue07W11go7HDceHOjvLMrQPm1dRbOMh7Wp5RvN8g1NBME+fIj0e5g0g2WBHVO r7oTsmDquyvGY2WOWZmRzUEhLm4MVjlLb2fJ01sZbc3GGYsNxqc1Fl2NCxoxOAQ0ztV3IT8ou rQvzzg/QTxmz3JyaFwAdq5rilBqZ09+UXMNyBzFiG+0AN2mdgncCWRKY8NEJLgA5R8WjKPqYi ntO2p+ptXBP8IFCuNxhBjleb5jq0938/XcKaX+g98o/NFT9AI5dM+h11FgYtN6/9FDLaafSrC 61P8uVRhpcOOTHJv7yf4Ghh2umz79rVq+ef40oz3mMOGZmjmtTH73Ocw8MRIIfj1HzYCnQNws oKLAM8UIGAYerXUo4F1bncQV6gJz5sKm5G8cVhPoObRWWYjKdCLVcP/de+vjq8wtnUjU= 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 4047f0a..27124c2 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 7464628..50adc4f 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) } static 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) { u32 count; -- 2.1.4