Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e7d5377 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 67039928

drivers/staging/wilc1000/linux_wlan.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/staging/wilc1000/linux_wlan_sdio.c

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/staging/wilc1000/linux_wlan_sdio.h

+0 −2
Original line number Diff line number Diff line 
#include <linux/mmc/sdio_func.h>



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);

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

+2 −7
Original line number Diff line number Diff line
@@ -11,9 +11,6 @@ 
 */



#include "wilc_wfi_cfgoperations.h"

#ifdef WILC_SDIO

#include "linux_wlan_sdio.h"

#endif

#include "host_interface.h"

#include <linux/errno.h>
@@ -3414,7 +3411,7 @@ static struct wireless_dev *WILC_WFI_CfgAlloc(void) 
 *  @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);

drivers/staging/wilc1000/wilc_wfi_cfgoperations.h

+1 −1
Original line number Diff line number Diff line
@@ -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);