From patchwork Mon Aug 17 18:46:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 258850 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8FF42C433DF for ; Mon, 17 Aug 2020 18:47:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6D043204EC for ; Mon, 17 Aug 2020 18:47:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391614AbgHQSrL (ORCPT ); Mon, 17 Aug 2020 14:47:11 -0400 Received: from mga17.intel.com ([192.55.52.151]:6211 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391615AbgHQSrF (ORCPT ); Mon, 17 Aug 2020 14:47:05 -0400 IronPort-SDR: S0CYcS3uaZ6aSXTEez6C1XDP02BFjqij+zbINeS1ohN9U30jZLWhVDr/u0RVAjiWf77CEDeo6n q7/QLNlWZKng== X-IronPort-AV: E=McAfee;i="6000,8403,9716"; a="134834836" X-IronPort-AV: E=Sophos;i="5.76,324,1592895600"; d="scan'208";a="134834836" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Aug 2020 11:47:02 -0700 IronPort-SDR: Oue4+mnNytP8+qxUku0BpW47W75srMVS2ZoPRHaRaaDMgLS8u0BI3jVyRNZCmVhob2QAmMgHiE /wObX+J0/s4g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,324,1592895600"; d="scan'208";a="279195010" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga008.fm.intel.com with ESMTP; 17 Aug 2020 11:47:01 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 6BD8F1C5; Mon, 17 Aug 2020 21:47:00 +0300 (EEST) From: Andy Shevchenko To: Greg Kroah-Hartman , linux-usb@vger.kernel.org, Mathias Nyman Cc: Andy Shevchenko , Jeff Kirsher , Sylwia Wnuczko Subject: [PATCH v2 4/8] i40e: Make use of le16_to_cpu_array() Date: Mon, 17 Aug 2020 21:46:55 +0300 Message-Id: <20200817184659.58419-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817184659.58419-1-andriy.shevchenko@linux.intel.com> References: <20200817184659.58419-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Since we have a new helper, let's replace open coded variant by it. Signed-off-by: Andy Shevchenko Cc: Jeff Kirsher Cc: Sylwia Wnuczko --- v2: new patch drivers/net/ethernet/intel/i40e/i40e_nvm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/ethernet/intel/i40e/i40e_nvm.c b/drivers/net/ethernet/intel/i40e/i40e_nvm.c index 7164f4ad8120..154505f352bc 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_nvm.c +++ b/drivers/net/ethernet/intel/i40e/i40e_nvm.c @@ -444,7 +444,6 @@ static i40e_status i40e_read_nvm_buffer_aq(struct i40e_hw *hw, u16 offset, u16 read_size; bool last_cmd = false; u16 words_read = 0; - u16 i = 0; do { /* Calculate number of bytes we should read in this step. @@ -475,8 +474,7 @@ static i40e_status i40e_read_nvm_buffer_aq(struct i40e_hw *hw, u16 offset, offset += read_size; } while (words_read < *words); - for (i = 0; i < *words; i++) - data[i] = le16_to_cpu(((__le16 *)data)[i]); + le16_to_cpu_array(data, data, *words); read_nvm_buffer_aq_exit: *words = words_read; From patchwork Mon Aug 17 18:46:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 258849 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9329BC433E1 for ; Mon, 17 Aug 2020 18:47:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7F12B20578 for ; Mon, 17 Aug 2020 18:47:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391628AbgHQSrU (ORCPT ); Mon, 17 Aug 2020 14:47:20 -0400 Received: from mga12.intel.com ([192.55.52.136]:13890 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391617AbgHQSrH (ORCPT ); Mon, 17 Aug 2020 14:47:07 -0400 IronPort-SDR: 1Wyq+2FLJnBK2sb9veiYx8tk30Bt2BsI+ZMGBB5I7F14ghqtdEttT2mpxYg0n5jOISNZVG/Wsn tFItISb6kmag== X-IronPort-AV: E=McAfee;i="6000,8403,9716"; a="134293874" X-IronPort-AV: E=Sophos;i="5.76,324,1592895600"; d="scan'208";a="134293874" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Aug 2020 11:47:03 -0700 IronPort-SDR: mHZjw8jse/XqMjn0OgkmVZFEniFjZucScjZsFB/Cm4h/VEMsMhM49PDNAZYXOwVXeM8GRfAWrm uuk2A5AKXBFw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,324,1592895600"; d="scan'208";a="334157251" Received: from black.fi.intel.com ([10.237.72.28]) by FMSMGA003.fm.intel.com with ESMTP; 17 Aug 2020 11:47:01 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 76FDB3D7; Mon, 17 Aug 2020 21:47:00 +0300 (EEST) From: Andy Shevchenko To: Greg Kroah-Hartman , linux-usb@vger.kernel.org, Mathias Nyman Cc: Andy Shevchenko , Jeff Kirsher , Jesse Brandeburg Subject: [PATCH v2 5/8] ice: Make use of le16_to_cpu_array() Date: Mon, 17 Aug 2020 21:46:56 +0300 Message-Id: <20200817184659.58419-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817184659.58419-1-andriy.shevchenko@linux.intel.com> References: <20200817184659.58419-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Since we have a new helper, let's replace open coded variant by it. Signed-off-by: Andy Shevchenko Cc: Jeff Kirsher Cc: Jesse Brandeburg --- v2: new patch drivers/net/ethernet/intel/ice/ice_nvm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_nvm.c b/drivers/net/ethernet/intel/ice/ice_nvm.c index 5903a36763de..3c376cb49e61 100644 --- a/drivers/net/ethernet/intel/ice/ice_nvm.c +++ b/drivers/net/ethernet/intel/ice/ice_nvm.c @@ -448,8 +448,8 @@ static enum ice_status ice_get_netlist_ver_info(struct ice_hw *hw) enum ice_status ret; u32 id_blk_start; __le16 raw_data; - u16 data, i; u16 *buff; + u16 data; ret = ice_acquire_nvm(hw, ICE_RES_READ); if (ret) @@ -494,8 +494,7 @@ static enum ice_status ice_get_netlist_ver_info(struct ice_hw *hw) if (ret) goto exit_error; - for (i = 0; i < ICE_AQC_NVM_NETLIST_ID_BLK_LEN; i++) - buff[i] = le16_to_cpu(((__force __le16 *)buff)[i]); + le16_to_cpu_array(buff, buff, ICE_AQC_NVM_NETLIST_ID_BLK_LEN); ver->major = (buff[ICE_AQC_NVM_NETLIST_ID_BLK_MAJOR_VER_HIGH] << 16) | buff[ICE_AQC_NVM_NETLIST_ID_BLK_MAJOR_VER_LOW]; From patchwork Mon Aug 17 18:46:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 258848 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2ED6FC433E1 for ; Mon, 17 Aug 2020 18:47:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 20BDE204EC for ; Mon, 17 Aug 2020 18:47:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391629AbgHQSrV (ORCPT ); Mon, 17 Aug 2020 14:47:21 -0400 Received: from mga02.intel.com ([134.134.136.20]:34839 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391620AbgHQSrH (ORCPT ); Mon, 17 Aug 2020 14:47:07 -0400 IronPort-SDR: uskqGMA10Oma3oy37AdN2b1njuurMuC0zDWbROcwamNVa70IzZUhEmyKRWkpO1ldQdqWaSgQV7 FRCFpJV7BX2A== X-IronPort-AV: E=McAfee;i="6000,8403,9716"; a="142602249" X-IronPort-AV: E=Sophos;i="5.76,324,1592895600"; d="scan'208";a="142602249" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Aug 2020 11:47:05 -0700 IronPort-SDR: NhoMsZxUMqWQ9n8/ODTRfpZKUWhcMWJqqbvgkg6avL8P6CxfK21tebRG9a4wOT+1wTxXXjkhpJ 53rzTcsashmg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,324,1592895600"; d="scan'208";a="326493007" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga008.jf.intel.com with ESMTP; 17 Aug 2020 11:47:03 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 7E0C2411; Mon, 17 Aug 2020 21:47:00 +0300 (EEST) From: Andy Shevchenko To: Greg Kroah-Hartman , linux-usb@vger.kernel.org, Mathias Nyman Cc: Andy Shevchenko Subject: [PATCH v2 6/8] usb: early: xhci-dbc: use readl_poll_timeout() to simplify code Date: Mon, 17 Aug 2020 21:46:57 +0300 Message-Id: <20200817184659.58419-6-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817184659.58419-1-andriy.shevchenko@linux.intel.com> References: <20200817184659.58419-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Use readl_poll_timeout() to poll the status of the registers. Signed-off-by: Andy Shevchenko --- v2: no change drivers/usb/early/xhci-dbc.c | 56 +++++++++++++++++------------------- 1 file changed, 27 insertions(+), 29 deletions(-) diff --git a/drivers/usb/early/xhci-dbc.c b/drivers/usb/early/xhci-dbc.c index c0507767a8e3..77c2e8301971 100644 --- a/drivers/usb/early/xhci-dbc.c +++ b/drivers/usb/early/xhci-dbc.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -131,38 +132,23 @@ static u32 __init xdbc_find_dbgp(int xdbc_num, u32 *b, u32 *d, u32 *f) return -1; } -static int handshake(void __iomem *ptr, u32 mask, u32 done, int wait, int delay) -{ - u32 result; - - do { - result = readl(ptr); - result &= mask; - if (result == done) - return 0; - udelay(delay); - wait -= delay; - } while (wait > 0); - - return -ETIMEDOUT; -} - static void __init xdbc_bios_handoff(void) { int offset, timeout; u32 val; offset = xhci_find_next_ext_cap(xdbc.xhci_base, 0, XHCI_EXT_CAPS_LEGACY); - val = readl(xdbc.xhci_base + offset); - if (val & XHCI_HC_BIOS_OWNED) { + val = readl(xdbc.xhci_base + offset); + if (val & XHCI_HC_BIOS_OWNED) writel(val | XHCI_HC_OS_OWNED, xdbc.xhci_base + offset); - timeout = handshake(xdbc.xhci_base + offset, XHCI_HC_BIOS_OWNED, 0, 5000, 10); - if (timeout) { - pr_notice("failed to hand over xHCI control from BIOS\n"); - writel(val & ~XHCI_HC_BIOS_OWNED, xdbc.xhci_base + offset); - } + timeout = readl_poll_timeout_atomic(xdbc.xhci_base + offset, val, + !(val & XHCI_HC_BIOS_OWNED), + 10, 5000); + if (timeout) { + pr_notice("failed to hand over xHCI control from BIOS\n"); + writel(val & ~XHCI_HC_BIOS_OWNED, xdbc.xhci_base + offset); } /* Disable BIOS SMIs and clear all SMI events: */ @@ -421,7 +407,9 @@ static int xdbc_start(void) ctrl = readl(&xdbc.xdbc_reg->control); writel(ctrl | CTRL_DBC_ENABLE | CTRL_PORT_ENABLE, &xdbc.xdbc_reg->control); - ret = handshake(&xdbc.xdbc_reg->control, CTRL_DBC_ENABLE, CTRL_DBC_ENABLE, 100000, 100); + ret = readl_poll_timeout_atomic(&xdbc.xdbc_reg->control, ctrl, + (ctrl & CTRL_DBC_ENABLE) == CTRL_DBC_ENABLE, + 100, 100000); if (ret) { xdbc_trace("failed to initialize hardware\n"); return ret; @@ -432,14 +420,18 @@ static int xdbc_start(void) xdbc_reset_debug_port(); /* Wait for port connection: */ - ret = handshake(&xdbc.xdbc_reg->portsc, PORTSC_CONN_STATUS, PORTSC_CONN_STATUS, 5000000, 100); + ret = readl_poll_timeout_atomic(&xdbc.xdbc_reg->portsc, status, + (status & PORTSC_CONN_STATUS) == PORTSC_CONN_STATUS, + 100, 5000000); if (ret) { xdbc_trace("waiting for connection timed out\n"); return ret; } /* Wait for debug device to be configured: */ - ret = handshake(&xdbc.xdbc_reg->control, CTRL_DBC_RUN, CTRL_DBC_RUN, 5000000, 100); + ret = readl_poll_timeout_atomic(&xdbc.xdbc_reg->control, status, + (status & CTRL_DBC_RUN) == CTRL_DBC_RUN, + 100, 5000000); if (ret) { xdbc_trace("waiting for device configuration timed out\n"); return ret; @@ -523,11 +515,14 @@ static int xdbc_bulk_transfer(void *data, int size, bool read) static int xdbc_handle_external_reset(void) { - int ret = 0; + u32 result; + int ret; xdbc.flags = 0; writel(0, &xdbc.xdbc_reg->control); - ret = handshake(&xdbc.xdbc_reg->control, CTRL_DBC_ENABLE, 0, 100000, 10); + ret = readl_poll_timeout_atomic(&xdbc.xdbc_reg->control, result, + !(result & CTRL_DBC_ENABLE), + 10, 100000); if (ret) goto reset_out; @@ -552,10 +547,13 @@ static int xdbc_handle_external_reset(void) static int __init xdbc_early_setup(void) { + u32 result; int ret; writel(0, &xdbc.xdbc_reg->control); - ret = handshake(&xdbc.xdbc_reg->control, CTRL_DBC_ENABLE, 0, 100000, 100); + ret = readl_poll_timeout_atomic(&xdbc.xdbc_reg->control, result, + !(result & CTRL_DBC_ENABLE), + 100, 100000); if (ret) return ret; From patchwork Mon Aug 17 18:46:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 258847 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F7CDC433E4 for ; Mon, 17 Aug 2020 18:47:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8F63E204EC for ; Mon, 17 Aug 2020 18:47:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390085AbgHQSrU (ORCPT ); Mon, 17 Aug 2020 14:47:20 -0400 Received: from mga02.intel.com ([134.134.136.20]:34836 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391628AbgHQSrO (ORCPT ); Mon, 17 Aug 2020 14:47:14 -0400 IronPort-SDR: 9KvaRhHUdq/OXIamnPQt2HVOQgdrwBSDN3r6sWqG22+bFb7HwniyPEEGYU4zlcrOEDZnWNPQGt Cao+JEfaUKlA== X-IronPort-AV: E=McAfee;i="6000,8403,9716"; a="142602250" X-IronPort-AV: E=Sophos;i="5.76,324,1592895600"; d="scan'208";a="142602250" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Aug 2020 11:47:05 -0700 IronPort-SDR: JjAghirCwbBFETuxjL/t9gyN/ap9xBtlOutOnZmrsCLiiniZg4u5QJCJjN3Wjlzav0iWUwrWi4 7AFBV8U4whLw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,324,1592895600"; d="scan'208";a="326493009" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga008.jf.intel.com with ESMTP; 17 Aug 2020 11:47:03 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 855A9456; Mon, 17 Aug 2020 21:47:00 +0300 (EEST) From: Andy Shevchenko To: Greg Kroah-Hartman , linux-usb@vger.kernel.org, Mathias Nyman Cc: Andy Shevchenko Subject: [PATCH v2 7/8] usb: early: xhci-dbc: Make use of cpu_to_le16_array() Date: Mon, 17 Aug 2020 21:46:58 +0300 Message-Id: <20200817184659.58419-7-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817184659.58419-1-andriy.shevchenko@linux.intel.com> References: <20200817184659.58419-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Since we have a new helper, let's replace open coded variant by it. Signed-off-by: Andy Shevchenko --- v2: updated commit message due to split (see patch 1) drivers/usb/early/xhci-dbc.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/usb/early/xhci-dbc.c b/drivers/usb/early/xhci-dbc.c index 77c2e8301971..c5761ea9394d 100644 --- a/drivers/usb/early/xhci-dbc.c +++ b/drivers/usb/early/xhci-dbc.c @@ -9,6 +9,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__ +#include #include #include #include @@ -200,14 +201,6 @@ static void xdbc_reset_ring(struct xdbc_ring *ring) } } -static inline void xdbc_put_utf16(u16 *s, const char *c, size_t size) -{ - int i; - - for (i = 0; i < size; i++) - s[i] = cpu_to_le16(c[i]); -} - static void xdbc_mem_init(void) { struct xdbc_ep_context *ep_in, *ep_out; @@ -263,7 +256,7 @@ static void xdbc_mem_init(void) s_desc->bLength = (strlen(XDBC_STRING_SERIAL) + 1) * 2; s_desc->bDescriptorType = USB_DT_STRING; - xdbc_put_utf16(s_desc->wData, XDBC_STRING_SERIAL, strlen(XDBC_STRING_SERIAL)); + cpu_to_le16_array(s_desc->wData, XDBC_STRING_SERIAL, strlen(XDBC_STRING_SERIAL)); string_length = s_desc->bLength; string_length <<= 8; @@ -272,7 +265,7 @@ static void xdbc_mem_init(void) s_desc->bLength = (strlen(XDBC_STRING_PRODUCT) + 1) * 2; s_desc->bDescriptorType = USB_DT_STRING; - xdbc_put_utf16(s_desc->wData, XDBC_STRING_PRODUCT, strlen(XDBC_STRING_PRODUCT)); + cpu_to_le16_array(s_desc->wData, XDBC_STRING_PRODUCT, strlen(XDBC_STRING_PRODUCT)); string_length += s_desc->bLength; string_length <<= 8; @@ -281,7 +274,7 @@ static void xdbc_mem_init(void) s_desc->bLength = (strlen(XDBC_STRING_MANUFACTURER) + 1) * 2; s_desc->bDescriptorType = USB_DT_STRING; - xdbc_put_utf16(s_desc->wData, XDBC_STRING_MANUFACTURER, strlen(XDBC_STRING_MANUFACTURER)); + cpu_to_le16_array(s_desc->wData, XDBC_STRING_MANUFACTURER, strlen(XDBC_STRING_MANUFACTURER)); string_length += s_desc->bLength; string_length <<= 8;