From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753197AbdC0Nkl (ORCPT ); Mon, 27 Mar 2017 09:40:41 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:53801 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751124AbdC0Nkg (ORCPT ); Mon, 27 Mar 2017 09:40:36 -0400 From: Stefan Wahren To: Rob Herring , Mark Rutland , "David S. Miller" Cc: Greg Kroah-Hartman , Jiri Slaby , Marcel Holtmann , Sebastian Reichel , netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, Stefan Wahren Subject: [PATCH RFC v4 03/10] net: qualcomm: move qcaspi_tx_cmd to qca_spi.c Date: Mon, 27 Mar 2017 15:37:21 +0200 Message-Id: <1490621848-24828-4-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1490621848-24828-1-git-send-email-stefan.wahren@i2se.com> References: <1490621848-24828-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V03:K0:kpuqiXimKV09szeu/nrswd2LLA6MmZjA/v8gOx/YNrZFMiYmZU5 /Pz9FePJrB03UNu0idL+bEyqqxxiMzjqNISplida2HGL7tr19z5317mH7t6lnups/RlwKNw xsDrfA4NXh4mz+yjMeTW8iypHM0rK4adgUZJGO4csQPEjV9QgGM/MMK183Njw1LwAkSBzp8 h9gIMnLfma+vXb5vb2Uyw== X-UI-Out-Filterresults: notjunk:1;V01:K0:itSLNarWJeo=:Vqh01fTz/fW/1oN013lVg4 hnXYpYrgQlXASVkH2lDdCYoo7Eg7dyvukpeVBAIx4syKqx5i21kYo/qs/b0u3ZzbsKYm8cQcL gnxIOajeXb3p71JkATcTVsf3iKSPjqfTnYXW4p1DxC42Gczmq/OvmE15zn86WnztW7Klu1Qjy NQ32BVwEk7DMHkGrzwgADlw7khPmiWlB4O+0p49pv8tgl69uBPYJwCiq+JG+MJUWVngLzBjFa M7dwsnzw93yTJAV2OwLPgEcKuHf+lg4qniMhFvO8SlfIVz82ZlMPfgv+gp/8MKw4EGso8bCZ0 YNJe0kiGCotL3eiB18UKO7MLKIjhe3o2Jt3laGM9XyKPP9Ifdt5i4Jvt3SCTMAjO4O6mtFZwv HVrmbTVB9Y4LMkqj/WXK7M/Ux23y1wRjHRWL77fBGPhi2up31aKXwrwr0qtrL3o7Akf0C7ajb rQHWQFhoWconIQqqteE55WALKSZZyKK2MlV+vOpvOzN6VDNs8IOorgXvH4NOiGqmJZ5qEEvAp 6LL5p7bOkkqN47U50jkzM5rMVtUPmUbo5XURphRm8dPKbdFaoP3ezzQS6HiqbBbXKhQaj0ZyG h2X2E3fbSBcUvhzBrl/ns3l+TeVmiIrCu7G9I5sa+7FPaIcURO582CNQgeBWxjLwrWFpOiJF3 3BJsjCrky6GRwAAUbL/6kIgnNqQ7FDSlo7f6YRJdazWfmxp6OI4HNQIQUv1jj8zKnvEU= 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 513e6c7..4f431bc 100644 --- a/drivers/net/ethernet/qualcomm/qca_spi.c +++ b/drivers/net/ethernet/qualcomm/qca_spi.c @@ -193,6 +193,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