From patchwork Fri Jan 16 16:06:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vaishali Thakkar X-Patchwork-Id: 5649351 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 53FA29F2ED for ; Fri, 16 Jan 2015 16:06:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 837A920265 for ; Fri, 16 Jan 2015 16:06:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AB54F200ED for ; Fri, 16 Jan 2015 16:06:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752910AbbAPQGX (ORCPT ); Fri, 16 Jan 2015 11:06:23 -0500 Received: from mail-pd0-f181.google.com ([209.85.192.181]:38232 "EHLO mail-pd0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751682AbbAPQGW (ORCPT ); Fri, 16 Jan 2015 11:06:22 -0500 Received: by mail-pd0-f181.google.com with SMTP id z10so11947305pdj.12 for ; Fri, 16 Jan 2015 08:06:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; bh=VOgCxPzf8PjpHwR9KkMGQ/dcXkth7NyEYqNuLCRPYHQ=; b=f3HWeUJ8WQJJv0iH9KNF7Ji37y98dTSnWoySFWtRCfjpdSmg4+SpE1xvN+LGVDdkKw i6V3XTY1vamoAVymrccAGT0TFGxHItcGZtjJtHXRehdmDR01Jca1+nw3+UwHe4JB72ei SdDU5U/nv64kxciW5aiU2f97YkMxJar7fYPIBcl222dj1+yNf7muTy2ai19HwTjZB1+i EydrqbH95Q+aMdemIYMpxEBYCZhcpfu+J1zOSLLX45SQEk+gRPJj9+/4IbYlE/SJftwN +GNCAEJNYmySkaoH5lgQgOwL+VEuHMvyFHfOaDl68VV7t6F8TjRgIjKvPF9W1tsx9z0m putQ== X-Received: by 10.70.47.6 with SMTP id z6mr13740478pdm.82.1421424382047; Fri, 16 Jan 2015 08:06:22 -0800 (PST) Received: from vaishali-Ideapad-Z570 ([27.116.51.222]) by mx.google.com with ESMTPSA id gx1sm4450068pbd.57.2015.01.16.08.06.18 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 16 Jan 2015 08:06:20 -0800 (PST) Date: Fri, 16 Jan 2015 21:36:14 +0530 From: Vaishali Thakkar To: Kalle Valo Cc: "John W. Linville" , "Franky (Zhenhui) Lin" , Arend van Spriel , Hante Meuleman , Brett Rudley , linux-wireless@vger.kernel.org Subject: [PATCH v2] brcmfmac: Use put_unaligned_le32 Message-ID: <20150116160613.GA11361@vaishali-Ideapad-Z570> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch introduces the use of function put_unaligned_le32. This is done using Coccinelle and semantic patch used is as follows: @a@ typedef u32, __le32, uint32_t; {u32,__le32,uint32_t} e32; identifier tmp; expression ptr; expression y,e; type T; type T; @@ - tmp = cpu_to_le32(y); <+... when != tmp ( - memcpy(ptr, (T)&tmp, \(4\|sizeof(u32)\|sizeof(__le32)\|sizeof(uint32_t)\|sizeof(e32)\)); + put_unaligned_le32(y,ptr); | - memcpy(ptr, (T)&tmp, ...); + put_unaligned_le32(y,ptr); ) ...+> ? tmp = e @@ type T; identifier a.tmp; @@ - T tmp; ...when != tmp Signed-off-by: Vaishali Thakkar --- Changes in v2: -refreshed it against changes -changed commit message drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c index 3aecc5f..ab3cc9f 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c @@ -3695,17 +3695,12 @@ static u32 brcmf_vndr_ie(u8 *iebuf, s32 pktflag, u8 *ie_ptr, u32 ie_len, s8 *add_del_cmd) { - __le32 iecount_le; - __le32 pktflag_le; - strncpy(iebuf, add_del_cmd, VNDR_IE_CMD_LEN - 1); iebuf[VNDR_IE_CMD_LEN - 1] = '\0'; - iecount_le = cpu_to_le32(1); - memcpy(&iebuf[VNDR_IE_COUNT_OFFSET], &iecount_le, sizeof(iecount_le)); + put_unaligned_le32(1, &iebuf[VNDR_IE_COUNT_OFFSET]); - pktflag_le = cpu_to_le32(pktflag); - memcpy(&iebuf[VNDR_IE_PKTFLAG_OFFSET], &pktflag_le, sizeof(pktflag_le)); + put_unaligned_le32(pktflag, &iebuf[VNDR_IE_PKTFLAG_OFFSET]); memcpy(&iebuf[VNDR_IE_VSIE_OFFSET], ie_ptr, ie_len);