From patchwork Sat May 12 08:17:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 8561 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 95CA923EB5 for ; Sat, 12 May 2012 08:17:56 +0000 (UTC) Received: from mail-gg0-f180.google.com (mail-gg0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id 65D23A1894D for ; Sat, 12 May 2012 08:17:56 +0000 (UTC) Received: by ggnf1 with SMTP id f1so2320325ggn.11 for ; Sat, 12 May 2012 01:17:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:x-gm-message-state; bh=2h0KckIZpdOqHF8J3eKilXrBrHNBzXfFZ+MVHirnBew=; b=Men5nI9EuuNF7Tr12cwAi2Ytg/tlSVtzv7t8muo4hjtV/rx5Y7T3q8oRjUKWn6vw7R KRespccZtxmdKetLBDKq99ofSsakHpHjYKnJdzBFcU0ezhPSLOL4yevAcJ6whTuzg1eL W9FgilIOg1+4hUOpgR+HaCPgnO5a2S38u63RQ7/r5QehQjb7N5AS4GU+mnL357uDDhiq xwjiD5d5HFZsc6k3XRyGLFNGGeHk8MVl7XqUxLskn2HCqw9n5za0OuwGs93VdCiV+g4C Byl+Gw7ui6c9gxcn8jLXZPrtRsOFMvp8kSeqabMfVKs5JMnu/UyvrRCPGsdyuR6ckaxN jprA== Received: by 10.42.130.7 with SMTP id t7mr430755ics.43.1336810675545; Sat, 12 May 2012 01:17:55 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.73.147 with SMTP id q19csp226577ibj; Sat, 12 May 2012 01:17:54 -0700 (PDT) Received: by 10.112.43.37 with SMTP id t5mr419303lbl.89.1336810674005; Sat, 12 May 2012 01:17:54 -0700 (PDT) Received: from mail.df.lth.se (mail.df.lth.se. [194.47.250.12]) by mx.google.com with ESMTPS id t10si6542608lat.14.2012.05.12.01.17.53 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 12 May 2012 01:17:53 -0700 (PDT) Received-SPF: neutral (google.com: 194.47.250.12 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=194.47.250.12; Authentication-Results: mx.google.com; spf=neutral (google.com: 194.47.250.12 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) smtp.mail=linus.walleij@linaro.org Received: from fecusia (c83-249-216-219.bredband.comhem.se [83.249.216.219]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.df.lth.se (Postfix) with ESMTPSA id A8C2F65D89; Sat, 12 May 2012 10:17:51 +0200 (CEST) Received: by fecusia (sSMTP sendmail emulation); Sat, 12 May 2012 10:17:51 +0200 From: "Linus Walleij" To: netdev@vger.kernel.org, linux-usb@vger.kernel.org, "David S. Miller" , Greg Kroah-Hartman , Felipe Balbi Cc: Jussi Kivilinna , Haiyang Zhang , Wei Yongjun , Ben Hutchings , Linus Walleij Subject: [PATCH 16/17 v5] rndis_host: cleanup: change oid from __le32 to u32 in rndis_query() Date: Sat, 12 May 2012 10:17:50 +0200 Message-Id: <1336810670-6619-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.7.7.6 X-Gm-Message-State: ALoCoQkvpqsEUl1e+ekvOcX07V3Su24uNO1mOpy9kP5YXQXeFWxV+8C0IJwDraf6/TlgHuBtOduC From: Jussi Kivilinna Signed-off-by: Jussi Kivilinna Signed-off-by: Linus Walleij --- drivers/net/usb/rndis_host.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c index 74315fd..0d746b3 100644 --- a/drivers/net/usb/rndis_host.c +++ b/drivers/net/usb/rndis_host.c @@ -239,7 +239,7 @@ EXPORT_SYMBOL_GPL(rndis_command); * ActiveSync 4.1 Windows driver. */ static int rndis_query(struct usbnet *dev, struct usb_interface *intf, - void *buf, __le32 oid, u32 in_len, + void *buf, u32 oid, u32 in_len, void **reply, int *reply_len) { int retval; @@ -256,7 +256,7 @@ static int rndis_query(struct usbnet *dev, struct usb_interface *intf, memset(u.get, 0, sizeof *u.get + in_len); u.get->msg_type = cpu_to_le32(RNDIS_MSG_QUERY); u.get->msg_len = cpu_to_le32(sizeof *u.get + in_len); - u.get->oid = oid; + u.get->oid = cpu_to_le32(oid); u.get->len = cpu_to_le32(in_len); u.get->offset = cpu_to_le32(20); @@ -399,8 +399,8 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags) phym = NULL; reply_len = sizeof *phym; retval = rndis_query(dev, intf, u.buf, - cpu_to_le32(RNDIS_OID_GEN_PHYSICAL_MEDIUM), - 0, (void **) &phym, &reply_len); + RNDIS_OID_GEN_PHYSICAL_MEDIUM, + 0, (void **) &phym, &reply_len); if (retval != 0 || !phym) { /* OID is optional so don't fail here. */ phym_unspec = cpu_to_le32(RNDIS_PHYSICAL_MEDIUM_UNSPECIFIED); @@ -424,8 +424,8 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags) /* Get designated host ethernet address */ reply_len = ETH_ALEN; retval = rndis_query(dev, intf, u.buf, - cpu_to_le32(RNDIS_OID_802_3_PERMANENT_ADDRESS), - 48, (void **) &bp, &reply_len); + RNDIS_OID_802_3_PERMANENT_ADDRESS, + 48, (void **) &bp, &reply_len); if (unlikely(retval< 0)) { dev_err(&intf->dev, "rndis get ethaddr, %d\n", retval); goto halt_fail_and_release;