Commit affbeba3 authored by Madhumitha Prabakaran's avatar Madhumitha Prabakaran Committed by Greg Kroah-Hartman
Browse files

Staging: rtl8723bs: Remove typedef in struct sdio_data 



Remove typedef in struct sdio_data and make the respective changes in
associated files, as the struct that has elements that can reasonably
be directly accessed should never be a typedef.

Signed-off-by: default avatarMadhumitha Prabakaran <madhumithabiw@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e00fd8ec

drivers/staging/rtl8723bs/hal/sdio_ops.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -425,7 +425,7 @@ static u32 sdio_read_port( 
)

)

{

{

	struct adapter *adapter;

	struct adapter *adapter;

	PSDIO_DATA psdio;

	struct sdio_data *psdio;

	struct hal_com_data *hal;

	struct hal_com_data *hal;

	u32 oldcnt;

	u32 oldcnt;

	s32 err;

	s32 err;
@@ -473,7 +473,7 @@ static u32 sdio_write_port( 
)

)

{

{

	struct adapter *adapter;

	struct adapter *adapter;

	PSDIO_DATA psdio;

	struct sdio_data *psdio;

	s32 err;

	s32 err;

	struct xmit_buf *xmitbuf = (struct xmit_buf *)mem;

	struct xmit_buf *xmitbuf = (struct xmit_buf *)mem;
@@ -1207,7 +1207,7 @@ u8 RecvOnePkt(struct adapter *adapter, u32 size) 
{

{

	struct recv_buf *recvbuf;

	struct recv_buf *recvbuf;

	struct dvobj_priv *sddev;

	struct dvobj_priv *sddev;

	PSDIO_DATA psdio_data;

	struct sdio_data *psdio;

	struct sdio_func *func;

	struct sdio_func *func;





	u8 res = false;

	u8 res = false;

drivers/staging/rtl8723bs/include/drv_types.h

+2 −4
Original line number Original line Diff line number Diff line
@@ -216,7 +216,6 @@ struct registry_priv 
#define BSSID_SZ(field)   sizeof(((struct wlan_bssid_ex *) 0)->field)

#define BSSID_SZ(field)   sizeof(((struct wlan_bssid_ex *) 0)->field)





#include <drv_types_sdio.h>

#include <drv_types_sdio.h>

#define INTF_DATA SDIO_DATA





#define is_primary_adapter(adapter) (1)

#define is_primary_adapter(adapter) (1)

#define get_iface_type(adapter) (IFACE_PORT0)

#define get_iface_type(adapter) (IFACE_PORT0)
@@ -472,9 +471,8 @@ struct dvobj_priv 




/*-------- below is for SDIO INTERFACE --------*/

/*-------- below is for SDIO INTERFACE --------*/





#ifdef INTF_DATA

struct sdio_data intf_data;

	INTF_DATA intf_data;



#endif

};

};





#define dvobj_to_pwrctl(dvobj) (&(dvobj->pwrctl_priv))

#define dvobj_to_pwrctl(dvobj) (&(dvobj->pwrctl_priv))

drivers/staging/rtl8723bs/include/drv_types_sdio.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ 
	#include <linux/mmc/card.h>

	#include <linux/mmc/card.h>

#endif

#endif





typedef struct sdio_data

struct sdio_data

{

{

	u8  func_number;

	u8  func_number;
@@ -26,6 +26,6 @@ typedef struct sdio_data 




	struct sdio_func	 *func;

	struct sdio_func	 *func;

	void *sys_sdio_irq_thd;

	void *sys_sdio_irq_thd;

} SDIO_DATA, *PSDIO_DATA;

};





#endif
 
#endif

drivers/staging/rtl8723bs/os_dep/sdio_intf.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -74,7 +74,7 @@ static void sd_sync_int_hdl(struct sdio_func *func) 




static int sdio_alloc_irq(struct dvobj_priv *dvobj)

static int sdio_alloc_irq(struct dvobj_priv *dvobj)

{

{

	PSDIO_DATA psdio_data;

	struct sdio_data *psdio_data;

	struct sdio_func *func;

	struct sdio_func *func;

	int err;

	int err;
@@ -102,7 +102,7 @@ static int sdio_alloc_irq(struct dvobj_priv *dvobj) 




static void sdio_free_irq(struct dvobj_priv *dvobj)

static void sdio_free_irq(struct dvobj_priv *dvobj)

{

{

    PSDIO_DATA psdio_data;

    struct sdio_data *psdio_data;

    struct sdio_func *func;

    struct sdio_func *func;

    int err;

    int err;
@@ -176,7 +176,7 @@ static void gpio_hostwakeup_free_irq(struct adapter *padapter) 




static u32 sdio_init(struct dvobj_priv *dvobj)

static u32 sdio_init(struct dvobj_priv *dvobj)

{

{

	PSDIO_DATA psdio_data;

	struct sdio_data *psdio_data;

	struct sdio_func *func;

	struct sdio_func *func;

	int err;

	int err;
@@ -248,7 +248,7 @@ static struct dvobj_priv *sdio_dvobj_init(struct sdio_func *func) 
{

{

	int status = _FAIL;

	int status = _FAIL;

	struct dvobj_priv *dvobj = NULL;

	struct dvobj_priv *dvobj = NULL;

	PSDIO_DATA psdio;

	struct sdio_data *psdio;





	dvobj = devobj_init();

	dvobj = devobj_init();

	if (dvobj == NULL) {

	if (dvobj == NULL) {
@@ -327,7 +327,7 @@ static struct adapter *rtw_sdio_if1_init(struct dvobj_priv *dvobj, const struct 
	int status = _FAIL;

	int status = _FAIL;

	struct net_device *pnetdev;

	struct net_device *pnetdev;

	struct adapter *padapter = NULL;

	struct adapter *padapter = NULL;

	PSDIO_DATA psdio = &dvobj->intf_data;

	struct sdio_data *psdio = &dvobj->intf_data;





	padapter = vzalloc(sizeof(*padapter));

	padapter = vzalloc(sizeof(*padapter));

	if (padapter == NULL) {

	if (padapter == NULL) {

drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c

+15 −15
Original line number Original line Diff line number Diff line
@@ -12,7 +12,7 @@ 
static bool rtw_sdio_claim_host_needed(struct sdio_func *func)

static bool rtw_sdio_claim_host_needed(struct sdio_func *func)

{

{

	struct dvobj_priv *dvobj = sdio_get_drvdata(func);

	struct dvobj_priv *dvobj = sdio_get_drvdata(func);

	PSDIO_DATA sdio_data = &dvobj->intf_data;

	struct sdio_data *sdio_data = &dvobj->intf_data;





	if (sdio_data->sys_sdio_irq_thd && sdio_data->sys_sdio_irq_thd == current)

	if (sdio_data->sys_sdio_irq_thd && sdio_data->sys_sdio_irq_thd == current)

		return false;

		return false;
@@ -21,7 +21,7 @@ static bool rtw_sdio_claim_host_needed(struct sdio_func *func) 




inline void rtw_sdio_set_irq_thd(struct dvobj_priv *dvobj, void *thd_hdl)

inline void rtw_sdio_set_irq_thd(struct dvobj_priv *dvobj, void *thd_hdl)

{

{

	PSDIO_DATA sdio_data = &dvobj->intf_data;

	struct sdio_data *sdio_data = &dvobj->intf_data;





	sdio_data->sys_sdio_irq_thd = thd_hdl;

	sdio_data->sys_sdio_irq_thd = thd_hdl;

}

}
@@ -30,7 +30,7 @@ u8 sd_f0_read8(struct intf_hdl *pintfhdl, u32 addr, s32 *err) 
{

{

	struct adapter *padapter;

	struct adapter *padapter;

	struct dvobj_priv *psdiodev;

	struct dvobj_priv *psdiodev;

	PSDIO_DATA psdio;

	struct sdio_data *psdio;





	u8 v = 0;

	u8 v = 0;

	struct sdio_func *func;

	struct sdio_func *func;
@@ -67,7 +67,7 @@ s32 _sd_cmd52_read(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pdata) 
{

{

	struct adapter *padapter;

	struct adapter *padapter;

	struct dvobj_priv *psdiodev;

	struct dvobj_priv *psdiodev;

	PSDIO_DATA psdio;

	struct sdio_data *psdio;





	int err = 0, i;

	int err = 0, i;

	struct sdio_func *func;

	struct sdio_func *func;
@@ -102,7 +102,7 @@ s32 sd_cmd52_read(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pdata) 
{

{

	struct adapter *padapter;

	struct adapter *padapter;

	struct dvobj_priv *psdiodev;

	struct dvobj_priv *psdiodev;

	PSDIO_DATA psdio;

	struct sdio_data *psdio;





	int err = 0;

	int err = 0;

	struct sdio_func *func;

	struct sdio_func *func;
@@ -137,7 +137,7 @@ s32 _sd_cmd52_write(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pdata) 
{

{

	struct adapter *padapter;

	struct adapter *padapter;

	struct dvobj_priv *psdiodev;

	struct dvobj_priv *psdiodev;

	PSDIO_DATA psdio;

	struct sdio_data *psdio;





	int err = 0, i;

	int err = 0, i;

	struct sdio_func *func;

	struct sdio_func *func;
@@ -172,7 +172,7 @@ s32 sd_cmd52_write(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pdata) 
{

{

	struct adapter *padapter;

	struct adapter *padapter;

	struct dvobj_priv *psdiodev;

	struct dvobj_priv *psdiodev;

	PSDIO_DATA psdio;

	struct sdio_data *psdio;





	int err = 0;

	int err = 0;

	struct sdio_func *func;

	struct sdio_func *func;
@@ -202,7 +202,7 @@ u8 sd_read8(struct intf_hdl *pintfhdl, u32 addr, s32 *err) 
{

{

	struct adapter *padapter;

	struct adapter *padapter;

	struct dvobj_priv *psdiodev;

	struct dvobj_priv *psdiodev;

	PSDIO_DATA psdio;

	struct sdio_data *psdio;





	u8 v = 0;

	u8 v = 0;

	struct sdio_func *func;

	struct sdio_func *func;
@@ -234,7 +234,7 @@ u32 sd_read32(struct intf_hdl *pintfhdl, u32 addr, s32 *err) 
{

{

	struct adapter *padapter;

	struct adapter *padapter;

	struct dvobj_priv *psdiodev;

	struct dvobj_priv *psdiodev;

	PSDIO_DATA psdio;

	struct sdio_data *psdio;

	u32 v = 0;

	u32 v = 0;

	struct sdio_func *func;

	struct sdio_func *func;

	bool claim_needed;

	bool claim_needed;
@@ -299,7 +299,7 @@ void sd_write8(struct intf_hdl *pintfhdl, u32 addr, u8 v, s32 *err) 
{

{

	struct adapter *padapter;

	struct adapter *padapter;

	struct dvobj_priv *psdiodev;

	struct dvobj_priv *psdiodev;

	PSDIO_DATA psdio;

	struct sdio_data *psdio;

	struct sdio_func *func;

	struct sdio_func *func;

	bool claim_needed;

	bool claim_needed;
@@ -328,7 +328,7 @@ void sd_write32(struct intf_hdl *pintfhdl, u32 addr, u32 v, s32 *err) 
{

{

	struct adapter *padapter;

	struct adapter *padapter;

	struct dvobj_priv *psdiodev;

	struct dvobj_priv *psdiodev;

	PSDIO_DATA psdio;

	struct sdio_data *psdio;

	struct sdio_func *func;

	struct sdio_func *func;

	bool claim_needed;

	bool claim_needed;
@@ -404,7 +404,7 @@ s32 _sd_read(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, void *pdata) 
{

{

	struct adapter *padapter;

	struct adapter *padapter;

	struct dvobj_priv *psdiodev;

	struct dvobj_priv *psdiodev;

	PSDIO_DATA psdio;

	struct sdio_data *psdio;





	int err = -EPERM;

	int err = -EPERM;

	struct sdio_func *func;

	struct sdio_func *func;
@@ -461,7 +461,7 @@ s32 sd_read(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, void *pdata) 
{

{

	struct adapter *padapter;

	struct adapter *padapter;

	struct dvobj_priv *psdiodev;

	struct dvobj_priv *psdiodev;

	PSDIO_DATA psdio;

	struct sdio_data *psdio;





	struct sdio_func *func;

	struct sdio_func *func;

	bool claim_needed;

	bool claim_needed;
@@ -505,7 +505,7 @@ s32 _sd_write(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, void *pdata) 
{

{

	struct adapter *padapter;

	struct adapter *padapter;

	struct dvobj_priv *psdiodev;

	struct dvobj_priv *psdiodev;

	PSDIO_DATA psdio;

	struct sdio_data *psdio;





	struct sdio_func *func;

	struct sdio_func *func;

	u32 size;

	u32 size;
@@ -565,7 +565,7 @@ s32 sd_write(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, void *pdata) 
{

{

	struct adapter *padapter;

	struct adapter *padapter;

	struct dvobj_priv *psdiodev;

	struct dvobj_priv *psdiodev;

	PSDIO_DATA psdio;

	struct sdio_data *psdio;

	struct sdio_func *func;

	struct sdio_func *func;

	bool claim_needed;

	bool claim_needed;

	s32 err =  -EPERM;

	s32 err =  -EPERM;