From patchwork Wed May 10 08:53:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 760507 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 3wN9Hy1fVhz9s2P for ; Wed, 10 May 2017 19:03:10 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753387AbdEJJCm (ORCPT ); Wed, 10 May 2017 05:02:42 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:52767 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752228AbdEJIxt (ORCPT ); Wed, 10 May 2017 04:53:49 -0400 Received: from duckbill-v2-sdk.fritz.box ([109.104.47.221]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.183]) with ESMTPSA (Nemesis) id 0M7Knm-1dv69C1u46-00x4p4; Wed, 10 May 2017 10:53:32 +0200 From: Stefan Wahren To: Rob Herring , "David S. Miller" Cc: Mark Rutland , Greg Kroah-Hartman , Jiri Slaby , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, Stefan Wahren Subject: [PATCH v5 07/17] net: qualcomm: move qcaspi_tx_cmd to qca_spi.c Date: Wed, 10 May 2017 10:53:18 +0200 Message-Id: <1494406408-31760-8-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1494406408-31760-1-git-send-email-stefan.wahren@i2se.com> References: <1494406408-31760-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V03:K0:ahVta8WBiwamjsnFIvEmMkLp2ihrfjGCsa9TBggU1YriexZePcW 0M/t/32HooXxFIkR2c1vGajdGVLcZWkSt1riKmpIFefW/XjOxuM2SEFhZ9xEqMKalEo2KeC bQQEHPkaZl0B2lpp3YRd3dF5qJ/rkYCCPHTiR7FK9bw6gyfRxj1Tp9UvljoIodHVjBA+ojj 9EJ4qd35ROSZQioeM4L/w== X-UI-Out-Filterresults: notjunk:1; V01:K0:Msdaj4Rg9GM=:J4oslKC4jLh0O6dtyWDrPQ xivYt/9/Q5z/pRJ4DkXRq7oOPPOmmfVoqQhWKOm0QvARUZ6OsWTJwx/gxNI0/NkGDLkIBYXtw f28g1uaw32/hXKguenllfC6W1ZgwXYKXZRRMVSEhI89hQGKAu9o1lk7i8ebyqtHhr02zpIuwP 24i08whCjns9gD7+dPtyg05jMlb57ZhdXPWb/TRJuk6QkbGkMypQfwd4IJ4885ssVxho2qLKN tr3UH3mjQSN//yBYvoCsMtzEojrv2tlsTNBHbQgmJA6il4X7ZoTYu0K/IH9jZy21yXia45YrQ J28Y7P4LzPeGBQ1E6XipiX1YAITy/ToNvQC73SvT2QDBP/+PbGhle44ecDT0OS//9AiZ12qnA l0NVsh+6Rn65U1+fqvJ4tgabi9WDqCzr18gadQkB65EleyCjDdVh4ML26915kSA1WHvaPtzA0 Q+6jSLDpCRttwjMjUJNutFdMCG1CyyynXOgN9cnL9hke5pPSTHudCjU/vu1sjMpT8XPszfsX3 7T+D0zmgvadz3m2u5YONYzQa4cQbT4FJZxT0QU5RNzUeoOsHQWnMNPs66l5bJIG/5LXeQpYtb ElpLlSPnxFq7XwPpyzceS0zYw1KGXMEvECqQopZD0H2kKXLgsF08yI2EpH6iHlts3L6xD/BaS DExqxYqVJnT0QE5xboiwuvv7frbZVLPWun6jRw4PWDO8wBwNPXVmgGocdVYikK/LIBZQ= 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 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 a239ac4..c727357 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;