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

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

ath6kl: remove-typedef HIF_DEVICE_OS_DEVICE_INFO 



remove-typedef -s HIF_DEVICE_OS_DEVICE_INFO \
	"struct hif_device_os_device_info" 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 02e12e08

drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c

+1 −1
Original line number Diff line number Diff line
@@ -730,7 +730,7 @@ HIFConfigureDevice(HIF_DEVICE *device, HIF_DEVICE_CONFIG_OPCODE opcode, 
            break; 

        case HIF_DEVICE_GET_OS_DEVICE:

                /* pass back a pointer to the SDIO function's "dev" struct */

            ((HIF_DEVICE_OS_DEVICE_INFO *)config)->pOSDevice = &device->func->dev;

            ((struct hif_device_os_device_info *)config)->pOSDevice = &device->func->dev;

            break; 

        case HIF_DEVICE_POWER_STATE_CHANGE:

            status = PowerStateChangeNotify(device, *(HIF_DEVICE_POWER_CHANGE_TYPE *)config);

drivers/staging/ath6kl/include/hif.h

+3 −3
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ typedef enum { 
 * 

 *   HIF_DEVICE_GET_OS_DEVICE

 *   intput : none

 *   output : HIF_DEVICE_OS_DEVICE_INFO;

 *   output : struct hif_device_os_device_info;

 *   note: On some operating systems, the HIF layer has a parent device object for the bus.  This object

 *         may be required to register certain types of logical devices.

 *
@@ -315,9 +315,9 @@ typedef struct _HIF_DEVICE_SCATTER_SUPPORT_INFO { 
    int                             MaxTransferSizePerScatterReq;

} HIF_DEVICE_SCATTER_SUPPORT_INFO;

                      

typedef struct {

struct hif_device_os_device_info {

    void    *pOSDevice;

} HIF_DEVICE_OS_DEVICE_INFO;

};

                      

#define HIF_MAX_DEVICES                 1

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

+5 −5
Original line number Diff line number Diff line
@@ -803,7 +803,7 @@ ar6000_sysfs_bmi_read(struct file *fp, struct kobject *kobj, 
{

    int index;

    AR_SOFTC_T *ar;

    HIF_DEVICE_OS_DEVICE_INFO   *osDevInfo;

    struct hif_device_os_device_info   *osDevInfo;



    AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("BMI: Read %d bytes\n", (u32)count));

    for (index=0; index < MAX_AR6000; index++) {
@@ -830,7 +830,7 @@ ar6000_sysfs_bmi_write(struct file *fp, struct kobject *kobj, 
{

    int index;

    AR_SOFTC_T *ar;

    HIF_DEVICE_OS_DEVICE_INFO   *osDevInfo;

    struct hif_device_os_device_info   *osDevInfo;



    AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("BMI: Write %d bytes\n", (u32)count));

    for (index=0; index < MAX_AR6000; index++) {
@@ -856,13 +856,13 @@ ar6000_sysfs_bmi_init(AR_SOFTC_T *ar) 
    int status;



    AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("BMI: Creating sysfs entry\n"));

    A_MEMZERO(&ar->osDevInfo, sizeof(HIF_DEVICE_OS_DEVICE_INFO));

    A_MEMZERO(&ar->osDevInfo, sizeof(struct hif_device_os_device_info));



    /* Get the underlying OS device */

    status = HIFConfigureDevice(ar->arHifDevice,

                                HIF_DEVICE_GET_OS_DEVICE,

                                &ar->osDevInfo,

                                sizeof(HIF_DEVICE_OS_DEVICE_INFO));

                                sizeof(struct hif_device_os_device_info));



    if (status) {

        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("BMI: Failed to get OS device info from HIF\n"));
@@ -1604,7 +1604,7 @@ ar6000_avail_ev(void *context, void *hif_handle) 
    struct wireless_dev *wdev;

#endif /* ATH6K_CONFIG_CFG80211 */

    int init_status = 0;

    HIF_DEVICE_OS_DEVICE_INFO osDevInfo;

    struct hif_device_os_device_info osDevInfo;



    memset(&osDevInfo, 0, sizeof(osDevInfo));

    if (HIFConfigureDevice(hif_handle, HIF_DEVICE_GET_OS_DEVICE,

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

+2 −2
Original line number Diff line number Diff line
@@ -76,8 +76,8 @@ ar6000_get_hif_dev(HIF_DEVICE *device, void *config) 


    status = HIFConfigureDevice(device,

                                HIF_DEVICE_GET_OS_DEVICE,

                                (HIF_DEVICE_OS_DEVICE_INFO *)config, 

                                sizeof(HIF_DEVICE_OS_DEVICE_INFO));

                                (struct hif_device_os_device_info *)config, 

                                sizeof(struct hif_device_os_device_info));

    return status;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -857,7 +857,7 @@ static int bt_setup_hci(struct ar6k_hci_bridge_info *pHcidevInfo) 
{

    int                    status = 0;

    struct hci_dev              *pHciDev = NULL;

    HIF_DEVICE_OS_DEVICE_INFO   osDevInfo;

    struct hif_device_os_device_info   osDevInfo;

    

    if (!setupbtdev) {

        return 0;