From patchwork Thu Jan 13 08:55:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= X-Patchwork-Id: 12712459 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D659CC433FE for ; Thu, 13 Jan 2022 08:56:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233234AbiAMI4i (ORCPT ); Thu, 13 Jan 2022 03:56:38 -0500 Received: from mail-dm6nam11on2047.outbound.protection.outlook.com ([40.107.223.47]:10080 "EHLO NAM11-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S231897AbiAMI4S (ORCPT ); Thu, 13 Jan 2022 03:56:18 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YSYWqLpNWB3bF+aTkunqM9phLGiglf1EJDeWVCGpRJGeDgZ1bmzEUB0weM3/Rj81d8xda4zu9pBnXQ0Oqq0C62FOL7+j003KzENPT6aT1Wq022JqwxlsmnA+Uo0D2bchRc8QG1l3IE0S4jjElkggVsQR/KFarWaVNIMryMAlARahHeFLm2NaKaxdpiXH1242+F6096ZBllAIcHzRroeJYo4T1YQBYgsiSVLxHlPv1iltmmYSiu/S5TID+oTsdRP9p/4hhu0t+Sf5npoB8tpcSZmu/hp6Z0YuPgDZGk/p+PnV7Rt9AnGTiGRTpYeacaGPt0uu9iFOYbrTs3yF/sbkkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=EFKTSebZbniqXelG5WghP9hFv/xZuXpXjmC05FRqzNA=; b=SpHkuEgFLQV2SvpNbfPgkrKqhJu3x4YW0JeQFYxJiauRNDUW1SvySgwH5ub9oYnnu5nt7aZdzXv/WzmnW4oopWJZ6YymYEKahRRTAU3mqD0qt/th0j4i8NgcubUZBFnmEDhACJN8R87h3DOPh3QACMc8hD1WO64J+vrVR/W/dXC62ZYoAM+//BW93nMEnrBZqShgsVcHx2apcLnmxTYW5hBxs++e/dr59qIrx2xK7GevFo25FoozV3qvwj/oa6BEqUaili92uqw/jn93GJTSnrH7+aHO+8GmZ95K/dvDVCC0G8F2r7n1LCL8gs9IsMxtxDTXxyZuyvd9ic3avVm5Yg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=silabs.com; dmarc=pass action=none header.from=silabs.com; dkim=pass header.d=silabs.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=silabs.onmicrosoft.com; s=selector2-silabs-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EFKTSebZbniqXelG5WghP9hFv/xZuXpXjmC05FRqzNA=; b=ArJJz1BXPS68Sx/9QaB2jRqWThzPkmE6YaqsVrvl8OSD+87jUL+L1gElcVyTjJAsf+c9Pk4blrwFCLOAkAGW4lOmRW9YVE1wsyibT/eX+uiHd1Wxlk3LwFwoCQ+9xnqjx+TT+q5p69xP+jqv/QhzMn1zq6xUa8bEttQYFO6rm8c= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=silabs.com; Received: from PH0PR11MB5657.namprd11.prod.outlook.com (2603:10b6:510:ee::19) by CY4PR1101MB2071.namprd11.prod.outlook.com (2603:10b6:910:1a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.9; Thu, 13 Jan 2022 08:56:15 +0000 Received: from PH0PR11MB5657.namprd11.prod.outlook.com ([fe80::d031:da9e:71a:73e4]) by PH0PR11MB5657.namprd11.prod.outlook.com ([fe80::d031:da9e:71a:73e4%5]) with mapi id 15.20.4888.011; Thu, 13 Jan 2022 08:56:15 +0000 From: Jerome Pouiller To: devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Kalle Valo , "David S . Miller" , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= Subject: [PATCH 19/31] staging: wfx: prefix structs tx_policy and hwbus_ops with wfx_ Date: Thu, 13 Jan 2022 09:55:12 +0100 Message-Id: <20220113085524.1110708-20-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220113085524.1110708-1-Jerome.Pouiller@silabs.com> References: <20220113085524.1110708-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: SA0PR11CA0117.namprd11.prod.outlook.com (2603:10b6:806:d1::32) To PH0PR11MB5657.namprd11.prod.outlook.com (2603:10b6:510:ee::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ada7dd3b-d154-4144-d023-08d9d6728e5b X-MS-TrafficTypeDiagnostic: CY4PR1101MB2071:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3173; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MpiTlg+VtJcflHn1pPqToIvW1fyLixWHEEYj5rmdVg7pJIoR5/5SbkUzYyiRqZJL1USaz4BpAQjndsrasJBHvviL/lOadDLQwkpQTjuQx9nbrvRqgANo8I8LxEj87WPDz3PuJH1+S23QxzOKLpcJP3GLIVmkDRNu6okzg+lBqf1fnLCan+11C21GxV5KWX5PlxhDIscO9s/mGsFOgaH+9Az9uGNC9sXesqZ1r2mBPKSJaC3QXCX2ycTznVZdpn6CH64WlYqCOpznYlXm5e3/zmulHcyPA4w8SGVYcfoOE2tczs5QrE4AKJyEFGAqW8tbpACWmlol+a31Ka1t2Jxx8vM1gVZxzVapjy0qKFH567FiKW7q8f6LiBOOraIrYB7VSYUNdRIJI61FXxIwWq8MxKGdohKhI8jX/A/Q5RyKXKf21QrCeZJpJAOzP13UglxWhmlGti7khPB89/6WdJeN7SgTOivLebZ4gc7AG7olHIZ5T95zFg+l13d4sKSni0ZTuy6qHnIQZ77SybrWzYhSc3jydxN+vRHtn7vZDeBk/Dx7p2/nwCtzHUBDkOSF0WI0YgaJMm1l3vBGtcAfQSnbbmrpSul2F/Vb4tW7T2xrJHwHMNm5jEDYyKrsVtMcAsnqkkKkXJZDyES5kRbOJ8KXKQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH0PR11MB5657.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(2616005)(66476007)(52116002)(8676002)(6486002)(4326008)(66574015)(38100700002)(8936002)(83380400001)(6506007)(107886003)(66556008)(6666004)(36756003)(508600001)(2906002)(5660300002)(6512007)(1076003)(86362001)(186003)(316002)(66946007)(54906003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?+RgTfeOMa9BhUNlJw0CBKkTICOV/?= =?utf-8?q?bUmj3zS/AVIo82eLTIMTRDPPOtY6ByZWNsRpmjj86rGuPxTWnXc8p8MRhNMrWxnVT?= =?utf-8?q?oZt13sr8P+KKpaEnaUnoPBT4Ki+DcX50c/VWPoEEQqOWhgFGAoejiSydYqC2v6Qtv?= =?utf-8?q?2Gigq9+gGP4p540jizx57u5zb8C38f71uOE8RET2gglA1Mqwq/eEddZqdxlGGKHFm?= =?utf-8?q?XtP9kRiNa3GeYFEYoudsoNv2tKVZ0oYg36HyQybsvmx+nuwl2jQOAPtxWMoexR/oZ?= =?utf-8?q?mqFtus9s0g930yhpc5YypGsTSWtP1Ppv6QDZJeVANQ1nDxgQ6HIMCHmCv4csJ3WLJ?= =?utf-8?q?NR8BE71+mtK/vIp17EH/CNmq1v8Toko2MYnr3P0wF3QCk0hheq4XQpU9yBe9s2lIv?= =?utf-8?q?/loDHEwZK5T4AOf0F/TiMlwW047glyvQEtuQVpbhktPruSXIkuWFNXap+tBGkd4yF?= =?utf-8?q?a5y232spraMbYQOaeStwZu/1QBIKmF0hZGhOqHy8DXJflhYS3RQYcq63ZDlFrayUf?= =?utf-8?q?MhqSsWBUOYzBDCJ4q0LdzjQlshpPjFg3aoPuckJf+UgTxceYF0EZTjNrkTDw5rLQR?= =?utf-8?q?1MMHIMNpQrDoZBTgS4VQYjPw4EWWBdDI5wH14M9o1IL42Ur2wBqaMzEocZXwWXca/?= =?utf-8?q?FJ7Ym8L/Np9mOVg0k4ibd9h5+CpY5lNac5Jz/Ps7PjcsVGHZv2rkoRHJBGZd0h0ca?= =?utf-8?q?qqf1K2VWjDQ3K28XAul2+hQkUO8Yzg2lvyAcVghN8h0cTCGGldk0j+Vl8ylpw29vh?= =?utf-8?q?BTRYJ55Uob0RSuAyimtTsvBk2l/2rPUrrdYvj5gJHPJsQ0SYcC/FDvm1NRSfF2swd?= =?utf-8?q?GFNsqGjyAe8/pkaGku+weWE21GKe4oHnEQGMmiw12h0npPOrkGDeDhFfGkxMxgzhh?= =?utf-8?q?78GeeacNG+Zy5gwihRP8+eF4ZMx9xMgl9X2djdeHbkFKZcMpB9sem2p1xWghQZBRc?= =?utf-8?q?8wdmfFjqoTXrFe1Q7z+CO/Bn6m+emWmKsTYnlS0udOqC3p8LyWqTUle0geXg333w5?= =?utf-8?q?EEYUhyMSgMib3Q4QZZ2EK5g4UZu1TjWQgG/ebEJH+AK+ZKmlhbyx/GeOdptdhVlJE?= =?utf-8?q?HxGxIrZReWQSbh86h9Fxlf+1+Nw3qbxqWTDFuSHdMSV9ShBdz8rAtOv2DR6g60ote?= =?utf-8?q?hmrUVzwt52LSNhMW6MRotXnE3rp0xJfPz8aVBV5nXAAZQcrQuRSYfB6IBSukfVk8G?= =?utf-8?q?9PbQc0yQ3ajk+B+KfVDiLXKsBbaocs/IQS5AapjdzvU5UBwJjptkH6/+94w8Xw10O?= =?utf-8?q?22smh29udzKdHcwqFKIrYrXqtGRHrJBpONr9dESRY2yoRAzrIvIk1tkFXqi46atDg?= =?utf-8?q?PlJBzFoRa6aCBqQ2Jf3de7Olox8yU0IsSC59ct1GTicSuGAsbrzH3DpSXYWwb6xd+?= =?utf-8?q?LLytg4dlE5FD8rz2H6zw9OkF0JGXFq1FoI2CLfrIDMiQ24XxmcR3ip5BL/BkeUklm?= =?utf-8?q?NNT6loFie1lieolkWugPU7L7hKUKdczYpDYV8EX0A97p12on/wIRZokH/ecdGoj0r?= =?utf-8?q?sxJckh+4u4kw6htpbOsIah6//yiz6hicEftUi/W/paLuo4h2OaGO0p6P/tylRlHI4?= =?utf-8?q?dANnFWX/7n6Eit4x270AmM0HQ5DhntkMod3cTSf8N5WLA+atn+PVXE=3D?= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: ada7dd3b-d154-4144-d023-08d9d6728e5b X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB5657.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jan 2022 08:56:15.4820 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 54dbd822-5231-4b20-944d-6f4abcd541fb X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 52q9htVdTVzeWdFsG2B5B4MRjOONFf6kr+87HxtGUMswyWspyTCovLHBFDRHNdLNNWGCDg8sh/W3ha8j9ewqZA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1101MB2071 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Jérôme Pouiller All the types related to a driver should use the same prefix. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/bus.h | 2 +- drivers/staging/wfx/bus_sdio.c | 2 +- drivers/staging/wfx/bus_spi.c | 2 +- drivers/staging/wfx/data_tx.c | 38 +++++++++++++++++----------------- drivers/staging/wfx/data_tx.h | 10 ++++----- drivers/staging/wfx/hif_rx.c | 4 ++-- drivers/staging/wfx/main.c | 2 +- drivers/staging/wfx/main.h | 4 ++-- drivers/staging/wfx/wfx.h | 6 +++--- 9 files changed, 35 insertions(+), 35 deletions(-) diff --git a/drivers/staging/wfx/bus.h b/drivers/staging/wfx/bus.h index ca04b3da6204..91b5a545b8ff 100644 --- a/drivers/staging/wfx/bus.h +++ b/drivers/staging/wfx/bus.h @@ -20,7 +20,7 @@ #define WFX_REG_SET_GEN_R_W 0x6 #define WFX_REG_FRAME_OUT 0x7 -struct hwbus_ops { +struct wfx_hwbus_ops { int (*copy_from_io)(void *bus_priv, unsigned int addr, void *dst, size_t count); int (*copy_to_io)(void *bus_priv, unsigned int addr, diff --git a/drivers/staging/wfx/bus_sdio.c b/drivers/staging/wfx/bus_sdio.c index 42aeab30bf0a..abcb507a48b3 100644 --- a/drivers/staging/wfx/bus_sdio.c +++ b/drivers/staging/wfx/bus_sdio.c @@ -159,7 +159,7 @@ static size_t wfx_sdio_align_size(void *priv, size_t size) return sdio_align_size(bus->func, size); } -static const struct hwbus_ops wfx_sdio_hwbus_ops = { +static const struct wfx_hwbus_ops wfx_sdio_hwbus_ops = { .copy_from_io = wfx_sdio_copy_from_io, .copy_to_io = wfx_sdio_copy_to_io, .irq_subscribe = wfx_sdio_irq_subscribe, diff --git a/drivers/staging/wfx/bus_spi.c b/drivers/staging/wfx/bus_spi.c index 55ffcd7c42e2..99d33a128830 100644 --- a/drivers/staging/wfx/bus_spi.c +++ b/drivers/staging/wfx/bus_spi.c @@ -168,7 +168,7 @@ static size_t wfx_spi_align_size(void *priv, size_t size) return ALIGN(size, 4); } -static const struct hwbus_ops wfx_spi_hwbus_ops = { +static const struct wfx_hwbus_ops wfx_spi_hwbus_ops = { .copy_from_io = wfx_spi_copy_from_io, .copy_to_io = wfx_spi_copy_to_io, .irq_subscribe = wfx_spi_irq_subscribe, diff --git a/drivers/staging/wfx/data_tx.c b/drivers/staging/wfx/data_tx.c index c004f455bb47..fec30d773e62 100644 --- a/drivers/staging/wfx/data_tx.c +++ b/drivers/staging/wfx/data_tx.c @@ -44,7 +44,7 @@ static int wfx_get_hw_rate(struct wfx_dev *wdev, /* TX policy cache implementation */ -static void wfx_tx_policy_build(struct wfx_vif *wvif, struct tx_policy *policy, +static void wfx_tx_policy_build(struct wfx_vif *wvif, struct wfx_tx_policy *policy, struct ieee80211_tx_rate *rates) { struct wfx_dev *wdev = wvif->wdev; @@ -66,16 +66,16 @@ static void wfx_tx_policy_build(struct wfx_vif *wvif, struct tx_policy *policy, } } -static bool wfx_tx_policy_is_equal(const struct tx_policy *a, - const struct tx_policy *b) +static bool wfx_tx_policy_is_equal(const struct wfx_tx_policy *a, + const struct wfx_tx_policy *b) { return !memcmp(a->rates, b->rates, sizeof(a->rates)); } -static int wfx_tx_policy_find(struct tx_policy_cache *cache, - struct tx_policy *wanted) +static int wfx_tx_policy_find(struct wfx_tx_policy_cache *cache, + struct wfx_tx_policy *wanted) { - struct tx_policy *it; + struct wfx_tx_policy *it; list_for_each_entry(it, &cache->used, link) if (wfx_tx_policy_is_equal(wanted, it)) @@ -86,15 +86,15 @@ static int wfx_tx_policy_find(struct tx_policy_cache *cache, return -1; } -static void wfx_tx_policy_use(struct tx_policy_cache *cache, - struct tx_policy *entry) +static void wfx_tx_policy_use(struct wfx_tx_policy_cache *cache, + struct wfx_tx_policy *entry) { ++entry->usage_count; list_move(&entry->link, &cache->used); } -static int wfx_tx_policy_release(struct tx_policy_cache *cache, - struct tx_policy *entry) +static int wfx_tx_policy_release(struct wfx_tx_policy_cache *cache, + struct wfx_tx_policy *entry) { int ret = --entry->usage_count; @@ -107,9 +107,9 @@ static int wfx_tx_policy_get(struct wfx_vif *wvif, struct ieee80211_tx_rate *rates, bool *renew) { int idx; - struct tx_policy_cache *cache = &wvif->tx_policy_cache; - struct tx_policy wanted; - struct tx_policy *entry; + struct wfx_tx_policy_cache *cache = &wvif->tx_policy_cache; + struct wfx_tx_policy wanted; + struct wfx_tx_policy *entry; wfx_tx_policy_build(wvif, &wanted, rates); @@ -127,7 +127,7 @@ static int wfx_tx_policy_get(struct wfx_vif *wvif, * entry in "free" list */ *renew = true; - entry = list_entry(cache->free.prev, struct tx_policy, link); + entry = list_entry(cache->free.prev, struct wfx_tx_policy, link); memcpy(entry->rates, wanted.rates, sizeof(entry->rates)); entry->uploaded = false; entry->usage_count = 0; @@ -143,7 +143,7 @@ static int wfx_tx_policy_get(struct wfx_vif *wvif, static void wfx_tx_policy_put(struct wfx_vif *wvif, int idx) { int usage, locked; - struct tx_policy_cache *cache = &wvif->tx_policy_cache; + struct wfx_tx_policy_cache *cache = &wvif->tx_policy_cache; if (idx == HIF_TX_RETRY_POLICY_INVALID) return; @@ -157,7 +157,7 @@ static void wfx_tx_policy_put(struct wfx_vif *wvif, int idx) static int wfx_tx_policy_upload(struct wfx_vif *wvif) { - struct tx_policy *policies = wvif->tx_policy_cache.cache; + struct wfx_tx_policy *policies = wvif->tx_policy_cache.cache; u8 tmp_rates[12]; int i, is_used; @@ -192,7 +192,7 @@ void wfx_tx_policy_upload_work(struct work_struct *work) void wfx_tx_policy_init(struct wfx_vif *wvif) { - struct tx_policy_cache *cache = &wvif->tx_policy_cache; + struct wfx_tx_policy_cache *cache = &wvif->tx_policy_cache; int i; memset(cache, 0, sizeof(*cache)); @@ -435,8 +435,8 @@ void wfx_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control, static void wfx_skb_dtor(struct wfx_vif *wvif, struct sk_buff *skb) { - struct wfx_hif_msg *hif = (struct hif_msg *)skb->data; - struct wfx_hif_req_tx *req = (struct hif_req_tx *)hif->body; + struct wfx_hif_msg *hif = (struct wfx_hif_msg *)skb->data; + struct wfx_hif_req_tx *req = (struct wfx_hif_req_tx *)hif->body; unsigned int offset = sizeof(struct wfx_hif_msg) + sizeof(struct wfx_hif_req_tx) + req->fc_offset; diff --git a/drivers/staging/wfx/data_tx.h b/drivers/staging/wfx/data_tx.h index c901a03ee4d8..040f731e62ae 100644 --- a/drivers/staging/wfx/data_tx.h +++ b/drivers/staging/wfx/data_tx.h @@ -18,15 +18,15 @@ struct wfx_tx_priv; struct wfx_dev; struct wfx_vif; -struct tx_policy { +struct wfx_tx_policy { struct list_head link; int usage_count; u8 rates[12]; bool uploaded; }; -struct tx_policy_cache { - struct tx_policy cache[HIF_TX_RETRY_POLICY_MAX]; +struct wfx_tx_policy_cache { + struct wfx_tx_policy cache[HIF_TX_RETRY_POLICY_MAX]; /* FIXME: use a trees and drop hash from tx_policy */ struct list_head used; struct list_head free; @@ -59,8 +59,8 @@ static inline struct wfx_tx_priv *wfx_skb_tx_priv(struct sk_buff *skb) static inline struct wfx_hif_req_tx *wfx_skb_txreq(struct sk_buff *skb) { - struct wfx_hif_msg *hif = (struct hif_msg *)skb->data; - struct wfx_hif_req_tx *req = (struct hif_req_tx *)hif->body; + struct wfx_hif_msg *hif = (struct wfx_hif_msg *)skb->data; + struct wfx_hif_req_tx *req = (struct wfx_hif_req_tx *)hif->body; return req; } diff --git a/drivers/staging/wfx/hif_rx.c b/drivers/staging/wfx/hif_rx.c index f2564a20bdcf..2073ac43bebd 100644 --- a/drivers/staging/wfx/hif_rx.c +++ b/drivers/staging/wfx/hif_rx.c @@ -110,7 +110,7 @@ static int wfx_hif_receive_indication(struct wfx_dev *wdev, __func__, hif->interface); return -EIO; } - skb_pull(skb, sizeof(struct wfx_hif_msg) + sizeof(struct hif_ind_rx)); + skb_pull(skb, sizeof(struct wfx_hif_msg) + sizeof(struct wfx_hif_ind_rx)); wfx_rx_cb(wvif, body, skb); return 0; @@ -380,7 +380,7 @@ static const struct { void wfx_handle_rx(struct wfx_dev *wdev, struct sk_buff *skb) { int i; - const struct wfx_hif_msg *hif = (const struct hif_msg *)skb->data; + const struct wfx_hif_msg *hif = (const struct wfx_hif_msg *)skb->data; int hif_id = hif->id; if (hif_id == HIF_IND_ID_RX) { diff --git a/drivers/staging/wfx/main.c b/drivers/staging/wfx/main.c index f34cfed503d4..7b9d75f219fb 100644 --- a/drivers/staging/wfx/main.c +++ b/drivers/staging/wfx/main.c @@ -262,7 +262,7 @@ static void wfx_free_common(void *data) struct wfx_dev *wfx_init_common(struct device *dev, const struct wfx_platform_data *pdata, - const struct hwbus_ops *hwbus_ops, + const struct wfx_hwbus_ops *hwbus_ops, void *hwbus_priv) { struct ieee80211_hw *hw; diff --git a/drivers/staging/wfx/main.h b/drivers/staging/wfx/main.h index 115abd2d4378..68a7807c5fb6 100644 --- a/drivers/staging/wfx/main.h +++ b/drivers/staging/wfx/main.h @@ -16,7 +16,7 @@ #include "hif_api_general.h" struct wfx_dev; -struct hwbus_ops; +struct wfx_hwbus_ops; struct wfx_platform_data { /* Keyset and ".sec" extension will be appended to this string */ @@ -31,7 +31,7 @@ struct wfx_platform_data { struct wfx_dev *wfx_init_common(struct device *dev, const struct wfx_platform_data *pdata, - const struct hwbus_ops *hwbus_ops, + const struct wfx_hwbus_ops *hwbus_ops, void *hwbus_priv); int wfx_probe(struct wfx_dev *wdev); diff --git a/drivers/staging/wfx/wfx.h b/drivers/staging/wfx/wfx.h index 1c06430e5996..189b96cd3d13 100644 --- a/drivers/staging/wfx/wfx.h +++ b/drivers/staging/wfx/wfx.h @@ -25,7 +25,7 @@ #define USEC_PER_TXOP 32 /* see struct ieee80211_tx_queue_params */ #define USEC_PER_TU 1024 -struct hwbus_ops; +struct wfx_hwbus_ops; struct wfx_dev { struct wfx_platform_data pdata; @@ -33,7 +33,7 @@ struct wfx_dev { struct ieee80211_hw *hw; struct ieee80211_vif *vif[2]; struct mac_address addresses[2]; - const struct hwbus_ops *hwbus_ops; + const struct wfx_hwbus_ops *hwbus_ops; void *hwbus_priv; u8 keyset; @@ -74,7 +74,7 @@ struct wfx_vif { struct delayed_work beacon_loss_work; struct wfx_queue tx_queue[4]; - struct tx_policy_cache tx_policy_cache; + struct wfx_tx_policy_cache tx_policy_cache; struct work_struct tx_policy_upload_work; struct work_struct update_tim_work;