From patchwork Tue Nov 10 23:42:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 7592931 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 5E98F9F392 for ; Tue, 10 Nov 2015 23:48:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 759BC205F9 for ; Tue, 10 Nov 2015 23:48:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 84101205EB for ; Tue, 10 Nov 2015 23:47:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752633AbbKJXrF (ORCPT ); Tue, 10 Nov 2015 18:47:05 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:58009 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752059AbbKJXnA (ORCPT ); Tue, 10 Nov 2015 18:43:00 -0500 Received: from wuerfel.lan. ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue103) with ESMTPSA (Nemesis) id 0MXFZN-1ZtOmo1EY9-00WIV0; Wed, 11 Nov 2015 00:42:55 +0100 From: Arnd Bergmann To: Greg Kroah-Hartman Cc: Johnny Kim , Austin Shin , Chris Park , Tony Cho , Glen Lee , Leo Kim , linux-wireless@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Arnd Bergmann Subject: [PATCH 13/20] staging/wilc1000: use device pointer for phy creation Date: Wed, 11 Nov 2015 00:42:33 +0100 Message-Id: <1447198960-2760143-14-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.1.0.rc2 In-Reply-To: <1447198960-2760143-1-git-send-email-arnd@arndb.de> References: <1447198960-2760143-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:KEJ60zQ/b/SpvQ0RRwfYhKBuJAY2HQkHUwLtPaJkd3T0Ik28QEU Zp94PMPqJwtM2NLYh3hRDMtZpl15UQjL5CLuDxTgRGTzl1IYyjCHQWwDVjrxBey45fFK8QF RGNYd85zyeHJ6ax8vlkBdum7qjAcqjq5pXLwx5VnDl1epbl9u9tXbbfMmIvmh3W5kE+TfFu s6dC3kvqDcsaO63Z4KHIw== X-UI-Out-Filterresults: notjunk:1; V01:K0:F1hPTF5TpW8=:ahru+BGPWLNSgAf4k25Ikb JXBpQy83GxJWy1PkRDH6IAA9ePXxdzFjkMHrk51AboT33cMuCW0IEmkUGCIUyjSZrOPYeFOyv DWstXLCUE79qHjZ9AzJgYyTsAJm+8UF/nvLzCNpCjnwO93J2oJ5H3ARtl5eTr4RQIdxb7bnMd Z8K26F1MZogeFAAsWC/8ecyzu3aqJ0sF7ECanl3HY9BuDo+6nwnYRwLwN93Dsi2DRUpkTBhHt N1GPFe1+e2lPIQGJoWVcxesvlKi8qwMnq90540s3sSJRJFD8hEFpV7SgSllZMYRWQuZ8efQWx qAXAn2i70Z0CXygbwhfc1pr0Va0UZi/EvyMsQiG0z2kIDtP9CbXfVAJ1wCz0Str40YvnfLpij rrunsqbvh0lQmWStlUoTQHeqdqdU0jPLHgxeUqNRl+accFuW7PKgNEH+yJmK75zz0rtFnLcZ3 72qJjkqzoA03DWMs64d69Aj1W2LKr9iLgDU2D3Dg4FTYlO4fTY94x38P99B1gN3lDyeADLgz+ bkZUsPmRbpwGfUxHwURRGQcEOWXDtV/ghMm1ed+VhDhYEPD4ogYZDGKHq/HhSpWHk7b+DWfLX Fsg+DTlKsHHCtxzYrCKA/cRzClFprcLNdLNwcDRMJnea/28FEvYOWUkUGIiuQgVxj0TY73KgS rZOPTWA9Srsd4TX2Oxz5F9wD8l9IQ/rJb+6rXJgGhtHBVD1uwD/392hHX+srxlX7WE+w= Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.2 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 wilc_create_wiphy tries to get a pointer to a device from the global wilc_sdio_func variable. This is a layering violation and we can use the wilc_dev->dev pointer instead. Signed-off-by: Arnd Bergmann --- drivers/staging/wilc1000/linux_wlan.c | 2 +- drivers/staging/wilc1000/linux_wlan_sdio.c | 2 +- drivers/staging/wilc1000/linux_wlan_sdio.h | 2 -- drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 9 ++------- drivers/staging/wilc1000/wilc_wfi_cfgoperations.h | 2 +- 5 files changed, 5 insertions(+), 12 deletions(-) diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index b1707147aa7d..08c3be8728b2 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -1457,7 +1457,7 @@ int wilc_netdev_init(struct wilc **wilc, struct device *dev, int io_type) { struct wireless_dev *wdev; - wdev = wilc_create_wiphy(ndev); + wdev = wilc_create_wiphy(ndev, dev); if (dev) SET_NETDEV_DEV(ndev, dev); diff --git a/drivers/staging/wilc1000/linux_wlan_sdio.c b/drivers/staging/wilc1000/linux_wlan_sdio.c index d2843b949a1b..874a859cad21 100644 --- a/drivers/staging/wilc1000/linux_wlan_sdio.c +++ b/drivers/staging/wilc1000/linux_wlan_sdio.c @@ -22,7 +22,7 @@ #define MAX_SPEED (6 * 1000000) /* Max 50M */ #endif -struct sdio_func *wilc_sdio_func; +static struct sdio_func *wilc_sdio_func; static unsigned int sdio_default_speed; #define SDIO_VENDOR_ID_WILC 0x0296 diff --git a/drivers/staging/wilc1000/linux_wlan_sdio.h b/drivers/staging/wilc1000/linux_wlan_sdio.h index 3e1618526e78..df733c25e770 100644 --- a/drivers/staging/wilc1000/linux_wlan_sdio.h +++ b/drivers/staging/wilc1000/linux_wlan_sdio.h @@ -1,7 +1,5 @@ #include -extern struct sdio_func *wilc_sdio_func; - int wilc_sdio_init(void); int wilc_sdio_cmd52(sdio_cmd52_t *cmd); int wilc_sdio_cmd53(sdio_cmd53_t *cmd); diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c index 46c3f578a6fd..cc279c654e53 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c @@ -11,9 +11,6 @@ */ #include "wilc_wfi_cfgoperations.h" -#ifdef WILC_SDIO -#include "linux_wlan_sdio.h" -#endif #include "host_interface.h" #include @@ -3414,7 +3411,7 @@ _fail_: * @date 01 MAR 2012 * @version 1.0 */ -struct wireless_dev *wilc_create_wiphy(struct net_device *net) +struct wireless_dev *wilc_create_wiphy(struct net_device *net, struct device *dev) { struct wilc_priv *priv; struct wireless_dev *wdev; @@ -3466,9 +3463,7 @@ struct wireless_dev *wilc_create_wiphy(struct net_device *net) wdev->wiphy->max_scan_ssids, wdev->wiphy->max_scan_ie_len, wdev->wiphy->signal_type, wdev->wiphy->interface_modes, wdev->iftype); - #ifdef WILC_SDIO - set_wiphy_dev(wdev->wiphy, &wilc_sdio_func->dev); - #endif + set_wiphy_dev(wdev->wiphy, dev); /*Register wiphy structure*/ s32Error = wiphy_register(wdev->wiphy); diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.h b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.h index 158d98c0eb87..ab53d9d59081 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.h +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.h @@ -10,7 +10,7 @@ #define NM_WFI_CFGOPERATIONS #include "wilc_wfi_netdevice.h" -struct wireless_dev *wilc_create_wiphy(struct net_device *net); +struct wireless_dev *wilc_create_wiphy(struct net_device *net, struct device *dev); void wilc_free_wiphy(struct net_device *net); int WILC_WFI_update_stats(struct wiphy *wiphy, u32 pktlen, u8 changed); int wilc_deinit_host_int(struct net_device *net);