diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-11-16 15:05:01 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-12-18 14:19:20 -0800 |
| commit | b03314e22571783488828f7f38fa708cbd3a1888 (patch) | |
| tree | 6e62606ebca9d5a176799fd47b15517dbc5dc140 /drivers/staging/wilc1000/wilc_wfi_netdevice.h | |
| parent | 857c7b00d2400b2f8a825b4710e9c3d2ebef4aa1 (diff) | |
staging/wilc1000: unify device pointer
struct wilc has two pointers to store the device, one for sdio_func
and one for spi_device. By changing the pointer to a 'struct device',
we can simplify the logic and avoid a few #ifdefs.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wilc1000/wilc_wfi_netdevice.h')
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wfi_netdevice.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h index 9adac5c781ee..a099f2877b6e 100644 --- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h +++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h @@ -185,11 +185,7 @@ struct wilc { const struct firmware *firmware; -#ifdef WILC_SDIO - struct sdio_func *wilc_sdio_func; -#else - struct spi_device *wilc_spidev; -#endif + struct device *dev; }; typedef struct { |