OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging/wilc1000: use device pointer for phy creation 

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 <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Arnd Bergmann 2015-11-16 15:05:03 +01:00 committed by Greg Kroah-Hartman
parent 6703992896
commit 2e7d5377f6
5 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/wilc1000/linux_wlan.c
View File

@ -1457,7 +1457,7 @@ int wilc_netdev_init(struct wilc **wilc, struct device *dev, int io_type)
{ {
struct wireless_dev *wdev; struct wireless_dev *wdev;
wdev = wilc_create_wiphy(ndev); wdev = wilc_create_wiphy(ndev, dev);
if (dev) if (dev)
SET_NETDEV_DEV(ndev, dev); SET_NETDEV_DEV(ndev, dev);

2
drivers/staging/wilc1000/linux_wlan_sdio.c
View File

@ -22,7 +22,7 @@
#define MAX_SPEED (6 * 1000000) /* Max 50M */ #define MAX_SPEED (6 * 1000000) /* Max 50M */
#endif #endif
struct sdio_func *wilc_sdio_func; static struct sdio_func *wilc_sdio_func;
static unsigned int sdio_default_speed; static unsigned int sdio_default_speed;
#define SDIO_VENDOR_ID_WILC 0x0296 #define SDIO_VENDOR_ID_WILC 0x0296

2
drivers/staging/wilc1000/linux_wlan_sdio.h
View File

@ -1,7 +1,5 @@
#include <linux/mmc/sdio_func.h> #include <linux/mmc/sdio_func.h>
extern struct sdio_func *wilc_sdio_func;
int wilc_sdio_init(void); int wilc_sdio_init(void);
int wilc_sdio_cmd52(sdio_cmd52_t *cmd); int wilc_sdio_cmd52(sdio_cmd52_t *cmd);
int wilc_sdio_cmd53(sdio_cmd53_t *cmd); int wilc_sdio_cmd53(sdio_cmd53_t *cmd);

9
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
View File

@ -11,9 +11,6 @@
*/ */
#include "wilc_wfi_cfgoperations.h" #include "wilc_wfi_cfgoperations.h"
#ifdef WILC_SDIO
#include "linux_wlan_sdio.h"
#endif
#include "host_interface.h" #include "host_interface.h"
#include <linux/errno.h> #include <linux/errno.h>
@ -3414,7 +3411,7 @@ _fail_:
* @date 01 MAR 2012 * @date 01 MAR 2012
* @version 1.0 * @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 wilc_priv *priv;
struct wireless_dev *wdev; 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->max_scan_ssids, wdev->wiphy->max_scan_ie_len, wdev->wiphy->signal_type,
wdev->wiphy->interface_modes, wdev->iftype); wdev->wiphy->interface_modes, wdev->iftype);
#ifdef WILC_SDIO set_wiphy_dev(wdev->wiphy, dev);
set_wiphy_dev(wdev->wiphy, &wilc_sdio_func->dev);
#endif
/*Register wiphy structure*/ /*Register wiphy structure*/
s32Error = wiphy_register(wdev->wiphy); s32Error = wiphy_register(wdev->wiphy);

2
drivers/staging/wilc1000/wilc_wfi_cfgoperations.h
View File

@ -10,7 +10,7 @@
#define NM_WFI_CFGOPERATIONS #define NM_WFI_CFGOPERATIONS
#include "wilc_wfi_netdevice.h" #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); void wilc_free_wiphy(struct net_device *net);
int WILC_WFI_update_stats(struct wiphy *wiphy, u32 pktlen, u8 changed); int WILC_WFI_update_stats(struct wiphy *wiphy, u32 pktlen, u8 changed);
int wilc_deinit_host_int(struct net_device *net); int wilc_deinit_host_int(struct net_device *net);