Merge branch 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...

[~andy/linux] / drivers / staging / winbond / wb35reg.c

diff --git a/drivers/staging/winbond/wb35reg.c b/drivers/staging/winbond/wb35reg.c
index 9be1b3b004b0bad90bd09c30843121d775ba45e3..a5e255bb0f8b1c2865d856820d0a30195830aae4 100644 (file)
--- a/drivers/staging/winbond/wb35reg.c
+++ b/drivers/staging/winbond/wb35reg.c
@@ -1,10 +1,9 @@
 #include "wb35reg_f.h"
+#include "phy_calibration.h"
 
 #include <linux/usb.h>
 #include <linux/slab.h>
 
-extern void phy_calibration_winbond(struct hw_data *phw_data, u32 frequency);
-
 /*
  * true  : read command process successfully
  * false : register not support
@@ -14,7 +13,8 @@ extern void phy_calibration_winbond(struct hw_data *phw_data, u32 frequency);
  * Flag : AUTO_INCREMENT - RegisterNo will auto increment 4
  *       NO_INCREMENT - Function will write data into the same register
  */
-unsigned char Wb35Reg_BurstWrite(struct hw_data *pHwData, u16 RegisterNo, u32 *pRegisterData, u8 NumberOfData, u8 Flag)
+unsigned char Wb35Reg_BurstWrite(struct hw_data *pHwData, u16 RegisterNo,
+                                u32 *pRegisterData, u8 NumberOfData, u8 Flag)
 {
        struct wb35_reg         *reg = &pHwData->reg;
        struct urb              *urb = NULL;
@@ -44,7 +44,7 @@ unsigned char Wb35Reg_BurstWrite(struct hw_data *pHwData, u16 RegisterNo, u32 *p
        reg_queue->pBuffer = (u32 *)((u8 *)reg_queue + sizeof(struct wb35_reg_queue));
        memcpy(reg_queue->pBuffer, pRegisterData, DataSize);
        /* the function for reversing register data from little endian to big endian */
-       for (i = 0; i < NumberOfData ; i++)
+       for (i = 0; i < NumberOfData; i++)
                reg_queue->pBuffer[i] = cpu_to_le32(reg_queue->pBuffer[i]);
 
        dr = (struct usb_ctrlrequest *)((u8 *)reg_queue + sizeof(struct wb35_reg_queue) + DataSize);
@@ -72,7 +72,7 @@ unsigned char Wb35Reg_BurstWrite(struct hw_data *pHwData, u16 RegisterNo, u32 *p
        return true;
 }
 
-void Wb35Reg_Update(struct hw_data *pHwData,  u16 RegisterNo,  u32 RegisterValue)
+void Wb35Reg_Update(struct hw_data *pHwData, u16 RegisterNo, u32 RegisterValue)
 {
        struct wb35_reg *reg = &pHwData->reg;
        switch (RegisterNo) {
@@ -118,7 +118,8 @@ void Wb35Reg_Update(struct hw_data *pHwData,  u16 RegisterNo,  u32 RegisterValue
  * true  : read command process successfully
  * false : register not support
  */
-unsigned char Wb35Reg_WriteSync(struct hw_data *pHwData, u16 RegisterNo, u32 RegisterValue)
+unsigned char Wb35Reg_WriteSync(struct hw_data *pHwData, u16 RegisterNo,
+                               u32 RegisterValue)
 {
        struct wb35_reg *reg = &pHwData->reg;
        int ret = -1;
@@ -139,9 +140,10 @@ unsigned char Wb35Reg_WriteSync(struct hw_data *pHwData, u16 RegisterNo, u32 Reg
        /* Sync IoCallDriver */
        reg->EP0vm_state = VM_RUNNING;
        ret = usb_control_msg(pHwData->udev,
-                              usb_sndctrlpipe(pHwData->udev, 0),
-                              0x03, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
-                              0x0, RegisterNo, &RegisterValue, 4, HZ * 100);
+                             usb_sndctrlpipe(pHwData->udev, 0),
+                             0x03,
+                             USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
+                             0x0, RegisterNo, &RegisterValue, 4, HZ * 100);
        reg->EP0vm_state = VM_STOP;
        reg->SyncIoPause = 0;
 
@@ -159,7 +161,8 @@ unsigned char Wb35Reg_WriteSync(struct hw_data *pHwData, u16 RegisterNo, u32 Reg
  * true  : read command process successfully
  * false : register not support
  */
-unsigned char Wb35Reg_Write(struct hw_data *pHwData, u16 RegisterNo, u32 RegisterValue)
+unsigned char Wb35Reg_Write(struct hw_data *pHwData, u16 RegisterNo,
+                           u32 RegisterValue)
 {
        struct wb35_reg         *reg = &pHwData->reg;
        struct usb_ctrlrequest  *dr;
@@ -286,7 +289,8 @@ unsigned char Wb35Reg_WriteWithCallbackValue(struct hw_data *pHwData,
  * pRegisterValue : It must be a resident buffer due to
  *                 asynchronous read register.
  */
-unsigned char Wb35Reg_ReadSync(struct hw_data *pHwData, u16 RegisterNo, u32 *pRegisterValue)
+unsigned char Wb35Reg_ReadSync(struct hw_data *pHwData, u16 RegisterNo,
+                              u32 *pRegisterValue)
 {
        struct wb35_reg *reg = &pHwData->reg;
        u32             *pltmp = pRegisterValue;
@@ -305,9 +309,10 @@ unsigned char Wb35Reg_ReadSync(struct hw_data *pHwData, u16 RegisterNo, u32 *pRe
 
        reg->EP0vm_state = VM_RUNNING;
        ret = usb_control_msg(pHwData->udev,
-                              usb_rcvctrlpipe(pHwData->udev, 0),
-                              0x01, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,
-                              0x0, RegisterNo, pltmp, 4, HZ * 100);
+                             usb_rcvctrlpipe(pHwData->udev, 0),
+                             0x01,
+                             USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,
+                             0x0, RegisterNo, pltmp, 4, HZ * 100);
 
        *pRegisterValue = cpu_to_le32(*pltmp);
 
@@ -332,7 +337,8 @@ unsigned char Wb35Reg_ReadSync(struct hw_data *pHwData, u16 RegisterNo, u32 *pRe
  * pRegisterValue : It must be a resident buffer due to
  *                 asynchronous read register.
  */
-unsigned char Wb35Reg_Read(struct hw_data *pHwData, u16 RegisterNo, u32 *pRegisterValue)
+unsigned char Wb35Reg_Read(struct hw_data *pHwData, u16 RegisterNo,
+                          u32 *pRegisterValue)
 {
        struct wb35_reg         *reg = &pHwData->reg;
        struct usb_ctrlrequest  *dr;