From patchwork Mon May 29 11:57:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 768169 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 3wbwPc1Djmz9s0m for ; Mon, 29 May 2017 22:03:48 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751429AbdE2MDq (ORCPT ); Mon, 29 May 2017 08:03:46 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:60783 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751002AbdE2L5u (ORCPT ); Mon, 29 May 2017 07:57:50 -0400 Received: from duckbill-v2-sdk.fritz.box ([109.104.48.59]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0Mhgu7-1dcDtz21xL-00Mtkk; Mon, 29 May 2017 13:57:36 +0200 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 v8 net-next 08/17] net: qualcomm: move qcaspi_tx_cmd to qca_spi.c Date: Mon, 29 May 2017 13:57:16 +0200 Message-Id: <1496059045-13572-9-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1496059045-13572-1-git-send-email-stefan.wahren@i2se.com> References: <1496059045-13572-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V03:K0:pohPbYTY1AiYyXJKj/kJFImOf6ClDtvUjO35TqCNufXkrUUgDK7 uUzExk8IMa0Gd4mO+n+dmNOgfkMl62ptkSdh34TQrn5+/zvARf7audIXJ+B8WZ5hYrQiMEZ hKpQu7H85drAKBuMGEj8A+oHjisP3CP9+I2FTGNB54olKgSXxC5Xk19iKJ7nBXQ0oXKuZ2Z D585G0cyK2QkvJCFzyMHA== X-UI-Out-Filterresults: notjunk:1; V01:K0:ArWMkmMeGSU=:4iZ3VO0IN4Thvp92xDyB1l D9UyPdUvrho2SilkkHkOE8wgnc01kZkLxpKTi4E35luIBKXAgok9LtynArVMOJcxJi4dzsAf9 QikJclB3oe6ntQ+XXWd33LgGw27lQl469s2lhYROOeGtC9zeUoxkN6p4Xkg895SC0dCjmATsj nMnj+IgloELKKlM7NqrB8eW4J2B7bXnv5g8l/dt4IvoX/VTzFy9OC7SwtQ+ioOa0KiwESq0sG S8fbj2Ua+fWn+iTpNmgwy7wEHQI5yxPE63O3WqCp/xb3jjQFz0fV41O6Q6peMUisXnQCVl36P aYL6IahVeTJeUStIjne9BaoxTGhei37Ky+9P2GaYbpMwnp3XUmuuLP2FtRe1frRDN+h1TNGe6 lPOajq/Lm3QlNDv54E+PkVKY0X1wB5PVZFQHZyQ9B1jzPOiPMm6jGPdX4tZah3jgWvLCJGyw5 X3Q6BF+DXUwf240Partc2qlfztYYYBrBEzal+xC27G8952GGEHrmZigWw2rLcq3NQqzkmABFT +gBbS9s6ztlCSWf06m0VcBaQNPI2Tru0KZIOh5v2NqXf5ZBaDOBuhi7hWSJDv5QU6BW35XACV b3BJwWvYOs0dHrpOL1I1O25lo1x7DPeVwcbpXOw3QSZs8GnEXw1YEQmAPne1pQdIjkzimIC54 jyF8130bdhdGj5ThjCA0jJl3VAtgRUsjOst4k/0morMxf6RQor1vjIoEruaSX6uat1Kw= 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 e9162e1..ffe7a16 100644 --- a/drivers/net/ethernet/qualcomm/qca_7k.c +++ b/drivers/net/ethernet/qualcomm/qca_7k.c @@ -121,27 +121,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;