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

Commit a71f0bf6 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by Greg Kroah-Hartman
Browse files

ath6kl: remove-typedef AR_SOFTC_T 



remove-typedef -s AR_SOFTC_T \
	"struct ar6_softc" drivers/staging/ath6kl/

Tested-by: default avatarNaveen Singh <nsingh@atheros.com>
Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b2bad087

drivers/staging/ath6kl/os/linux/ar6000_android.c

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ void android_module_exit(void) 
}



#ifdef CONFIG_PM

void android_ar6k_check_wow_status(AR_SOFTC_T *ar, struct sk_buff *skb, bool isEvent)

void android_ar6k_check_wow_status(struct ar6_softc *ar, struct sk_buff *skb, bool isEvent)

{

    if (

#ifdef CONFIG_HAS_EARLYSUSPEND

drivers/staging/ath6kl/os/linux/ar6000_drv.c

+121 −121

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/ath6kl/os/linux/ar6000_pm.c

+9 −9
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ extern unsigned int wmitimeout; 
extern wait_queue_head_t arEvent;



#ifdef ANDROID_ENV

extern void android_ar6k_check_wow_status(AR_SOFTC_T *ar, struct sk_buff *skb, bool isEvent);

extern void android_ar6k_check_wow_status(struct ar6_softc *ar, struct sk_buff *skb, bool isEvent);

#endif

#undef ATH_MODULE_NAME

#define ATH_MODULE_NAME pm
@@ -57,10 +57,10 @@ ATH_DEBUG_INSTANTIATE_MODULE_VAR(pm, 


#endif /* DEBUG */



int ar6000_exit_cut_power_state(AR_SOFTC_T *ar);

int ar6000_exit_cut_power_state(struct ar6_softc *ar);



#ifdef CONFIG_PM

static void ar6k_send_asleep_event_to_app(AR_SOFTC_T *ar, bool asleep)

static void ar6k_send_asleep_event_to_app(struct ar6_softc *ar, bool asleep)

{

    char buf[128];

    union iwreq_data wrqu;
@@ -71,7 +71,7 @@ static void ar6k_send_asleep_event_to_app(AR_SOFTC_T *ar, bool asleep) 
    wireless_send_event(ar->arNetDev, IWEVCUSTOM, &wrqu, buf);

}



static void ar6000_wow_resume(AR_SOFTC_T *ar)

static void ar6000_wow_resume(struct ar6_softc *ar)

{

    if (ar->arWowState!= WLAN_WOW_STATE_NONE) {

        u16 fg_start_period = (ar->scParams.fg_start_period==0) ? 1 : ar->scParams.fg_start_period;
@@ -110,7 +110,7 @@ static void ar6000_wow_resume(AR_SOFTC_T *ar) 
    ar->arWlanPowerState = WLAN_POWER_STATE_ON;

}



static void ar6000_wow_suspend(AR_SOFTC_T *ar)

static void ar6000_wow_suspend(struct ar6_softc *ar)

{

#define WOW_LIST_ID 1

    if (ar->arNetworkType != AP_NETWORK) {
@@ -214,7 +214,7 @@ static void ar6000_wow_suspend(AR_SOFTC_T *ar) 
int ar6000_suspend_ev(void *context)

{

    int status = 0;

    AR_SOFTC_T *ar = (AR_SOFTC_T *)context;

    struct ar6_softc *ar = (struct ar6_softc *)context;

    s16 pmmode = ar->arSuspendConfig;

wow_not_connected:

    switch (pmmode) {
@@ -250,7 +250,7 @@ int ar6000_suspend_ev(void *context) 


int ar6000_resume_ev(void *context)

{

    AR_SOFTC_T *ar = (AR_SOFTC_T *)context;

    struct ar6_softc *ar = (struct ar6_softc *)context;

    u16 powerState = ar->arWlanPowerState;



    AR_DEBUG_PRINTF(ATH_DEBUG_PM, ("%s: enter previous state %d wowState %d\n", __func__, powerState, ar->arWowState));
@@ -273,7 +273,7 @@ int ar6000_resume_ev(void *context) 
    return 0;

}



void ar6000_check_wow_status(AR_SOFTC_T *ar, struct sk_buff *skb, bool isEvent)

void ar6000_check_wow_status(struct ar6_softc *ar, struct sk_buff *skb, bool isEvent)

{

    if (ar->arWowState!=WLAN_WOW_STATE_NONE) {

        if (ar->arWowState==WLAN_WOW_STATE_SUSPENDING) {
@@ -292,7 +292,7 @@ void ar6000_check_wow_status(AR_SOFTC_T *ar, struct sk_buff *skb, bool isEvent) 


int ar6000_power_change_ev(void *context, u32 config)

{

    AR_SOFTC_T *ar = (AR_SOFTC_T *)context;

    struct ar6_softc *ar = (struct ar6_softc *)context;

    int status = 0;



    AR_DEBUG_PRINTF(ATH_DEBUG_PM, ("%s: power change event callback %d \n", __func__, config));

drivers/staging/ath6kl/os/linux/ar6000_raw_if.c

+9 −9
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
static void

ar6000_htc_raw_read_cb(void *Context, struct htc_packet *pPacket)

{

    AR_SOFTC_T        *ar = (AR_SOFTC_T *)Context;

    struct ar6_softc        *ar = (struct ar6_softc *)Context;

    raw_htc_buffer    *busy;

    HTC_RAW_STREAM_ID streamID; 

    AR_RAW_HTC_T *arRaw = ar->arRawHtc;
@@ -72,7 +72,7 @@ ar6000_htc_raw_read_cb(void *Context, struct htc_packet *pPacket) 
static void

ar6000_htc_raw_write_cb(void *Context, struct htc_packet *pPacket)

{

    AR_SOFTC_T          *ar = (AR_SOFTC_T  *)Context;

    struct ar6_softc          *ar = (struct ar6_softc  *)Context;

    raw_htc_buffer      *free;

    HTC_RAW_STREAM_ID   streamID;

    AR_RAW_HTC_T *arRaw = ar->arRawHtc;
@@ -111,7 +111,7 @@ ar6000_htc_raw_write_cb(void *Context, struct htc_packet *pPacket) 
}



/* connect to a service */

static int ar6000_connect_raw_service(AR_SOFTC_T        *ar,

static int ar6000_connect_raw_service(struct ar6_softc        *ar,

                                           HTC_RAW_STREAM_ID StreamID)

{

    int                 status;
@@ -166,7 +166,7 @@ static int ar6000_connect_raw_service(AR_SOFTC_T *ar, 
    return status;

}



int ar6000_htc_raw_open(AR_SOFTC_T *ar)

int ar6000_htc_raw_open(struct ar6_softc *ar)

{

    int status;

    int streamID, endPt, count2;
@@ -272,7 +272,7 @@ int ar6000_htc_raw_open(AR_SOFTC_T *ar) 
    return 0;

}



int ar6000_htc_raw_close(AR_SOFTC_T *ar)

int ar6000_htc_raw_close(struct ar6_softc *ar)

{

    A_PRINTF("ar6000_htc_raw_close called \n");

    HTCStop(ar->arHtcTarget);
@@ -286,7 +286,7 @@ int ar6000_htc_raw_close(AR_SOFTC_T *ar) 
}



raw_htc_buffer *

get_filled_buffer(AR_SOFTC_T *ar, HTC_RAW_STREAM_ID StreamID)

get_filled_buffer(struct ar6_softc *ar, HTC_RAW_STREAM_ID StreamID)

{

    int count;

    raw_htc_buffer *busy;
@@ -308,7 +308,7 @@ get_filled_buffer(AR_SOFTC_T *ar, HTC_RAW_STREAM_ID StreamID) 
    return busy;

}



ssize_t ar6000_htc_raw_read(AR_SOFTC_T *ar, HTC_RAW_STREAM_ID StreamID, 

ssize_t ar6000_htc_raw_read(struct ar6_softc *ar, HTC_RAW_STREAM_ID StreamID, 

                            char __user *buffer, size_t length)

{

    int readPtr;
@@ -368,7 +368,7 @@ ssize_t ar6000_htc_raw_read(AR_SOFTC_T *ar, HTC_RAW_STREAM_ID StreamID, 
}



static raw_htc_buffer *

get_free_buffer(AR_SOFTC_T *ar, HTC_ENDPOINT_ID StreamID)

get_free_buffer(struct ar6_softc *ar, HTC_ENDPOINT_ID StreamID)

{

    int count;

    raw_htc_buffer *free;
@@ -390,7 +390,7 @@ get_free_buffer(AR_SOFTC_T *ar, HTC_ENDPOINT_ID StreamID) 
    return free;

}



ssize_t ar6000_htc_raw_write(AR_SOFTC_T *ar, HTC_RAW_STREAM_ID StreamID,

ssize_t ar6000_htc_raw_write(struct ar6_softc *ar, HTC_RAW_STREAM_ID StreamID,

                     char __user *buffer, size_t length)

{

    int writePtr;

drivers/staging/ath6kl/os/linux/ar6k_pal.c

+4 −4
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ typedef struct ar6k_hci_pal_info_s{ 
#define HCI_NORMAL_MODE (1)

#define HCI_REGISTERED (1<<1)

	struct hci_dev *hdev;            /* BT Stack HCI dev */

	AR_SOFTC_T *ar;

	struct ar6_softc *ar;



}ar6k_hci_pal_info_t;
@@ -122,7 +122,7 @@ static int btpal_send_frame(struct sk_buff *skb) 
	ar6k_hci_pal_info_t *pHciPalInfo;

	int status = 0;

	struct sk_buff *txSkb = NULL;

	AR_SOFTC_T *ar;

	struct ar6_softc *ar;



	if (!hdev) {

		PRIN_LOG("HCI PAL: btpal_send_frame - no device\n");
@@ -313,7 +313,7 @@ static int bt_setup_hci_pal(ar6k_hci_pal_info_t *pHciPalInfo) 
 *********************************************/

void ar6k_cleanup_hci_pal(void *ar_p)

{

	AR_SOFTC_T *ar = (AR_SOFTC_T *)ar_p;

	struct ar6_softc *ar = (struct ar6_softc *)ar_p;

	ar6k_hci_pal_info_t *pHciPalInfo = (ar6k_hci_pal_info_t *)ar->hcipal_info;



	if (pHciPalInfo != NULL) {
@@ -405,7 +405,7 @@ int ar6k_setup_hci_pal(void *ar_p) 
	int status = 0;

	ar6k_hci_pal_info_t *pHciPalInfo;

	ar6k_pal_config_t ar6k_pal_config;

	AR_SOFTC_T *ar = (AR_SOFTC_T *)ar_p;

	struct ar6_softc *ar = (struct ar6_softc *)ar_p;



	do {