From patchwork Fri Jul 31 07:38:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Cho X-Patchwork-Id: 6908471 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 62A7FC05AC for ; Fri, 31 Jul 2015 07:39:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 94F0720511 for ; Fri, 31 Jul 2015 07:39:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B00662050E for ; Fri, 31 Jul 2015 07:39:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751272AbbGaHjT (ORCPT ); Fri, 31 Jul 2015 03:39:19 -0400 Received: from eusmtp01.atmel.com ([212.144.249.243]:44151 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750786AbbGaHjS (ORCPT ); Fri, 31 Jul 2015 03:39:18 -0400 Received: from tony-ThinkPad-T420.corp.atmel.com (10.161.101.13) by eusmtp01.atmel.com (10.161.101.31) with Microsoft SMTP Server id 14.3.235.1; Fri, 31 Jul 2015 09:39:11 +0200 From: Tony Cho To: CC: , , , , , , , , , , , Subject: [PATCH 03/28] staging: wilc1000: move structure WILC_WFIDrvHandle into wilc_wlan_if.h Date: Fri, 31 Jul 2015 16:38:11 +0900 Message-ID: <1438328316-30197-4-git-send-email-tony.cho@atmel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1438328316-30197-1-git-send-email-tony.cho@atmel.com> References: <1438328316-30197-1-git-send-email-tony.cho@atmel.com> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 From: glen lee This patch moves the structure WILC_WFIDrvHandle into wilc_wlan_if.h As all the functions which take drive handler as argument will use WILC_WFIDrvHandle type instead of u32 type that makes compile warning due to type difference, move it into wilc_wlan_if which is common wilc header file. Signed-off-by: glen lee Signed-off-by: Tony Cho --- drivers/staging/wilc1000/host_interface.h | 3 --- drivers/staging/wilc1000/wilc_wlan_if.h | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h index 7699650..617f105 100644 --- a/drivers/staging/wilc1000/host_interface.h +++ b/drivers/staging/wilc1000/host_interface.h @@ -212,9 +212,6 @@ typedef void (*tWILCpfRemainOnChanReady)(void *); /*Remain on channel callback f #endif /* typedef u32 WILC_WFIDrvHandle; */ -typedef struct { - s32 s32Dummy; -} *WILC_WFIDrvHandle; /*! * @struct tstrRcvdNetworkInfo diff --git a/drivers/staging/wilc1000/wilc_wlan_if.h b/drivers/staging/wilc1000/wilc_wlan_if.h index 8735a6a..ba22d30 100644 --- a/drivers/staging/wilc1000/wilc_wlan_if.h +++ b/drivers/staging/wilc1000/wilc_wlan_if.h @@ -63,6 +63,10 @@ ********************************************/ typedef struct { + s32 s32Dummy; +} *WILC_WFIDrvHandle; + +typedef struct { uint32_t read_write: 1; uint32_t function: 3; uint32_t raw: 1;