lkml.org 
[lkml]   [2012]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] Staging: ft1000: checkpatch.pl cleanup of ft1000_usb.h
    Date
    Fix numerous checkpatch.pl errors and warnings and other minor
    coding style issues.

    Signed-off-by: Chad Williamson <chad@dahc.us>
    ---
    drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 193 +++++++++++++-----------
    1 files changed, 102 insertions(+), 91 deletions(-)

    diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
    index 51c0847..dcb2566 100644
    --- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
    +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
    @@ -4,63 +4,64 @@
    /*Jim*/
    #include "../ft1000.h"
    #include "ft1000_ioctl.h"
    -#define FT1000_DRV_VER 0x01010403
    +#define FT1000_DRV_VER 0x01010403

    #define MAX_NUM_APP 6
    #define MAX_MSG_LIMIT 200
    #define NUM_OF_FREE_BUFFERS 1500

    -#define PSEUDOSZ 16
    +#define PSEUDOSZ 16

    #define SUCCESS 0x00

    struct app_info_block {
    - u32 nTxMsg; // DPRAM msg sent to DSP with app_id
    - u32 nRxMsg; // DPRAM msg rcv from dsp with app_id
    - u32 nTxMsgReject; // DPRAM msg rejected due to DSP doorbell set
    - u32 nRxMsgMiss; // DPRAM msg dropped due to overflow
    - struct fown_struct *fileobject;// Application's file object
    - u16 app_id; // Application id
    + u32 nTxMsg; /* DPRAM msg sent to DSP with app_id */
    + u32 nRxMsg; /* DPRAM msg rcv from dsp with app_id */
    + u32 nTxMsgReject; /* DPRAM msg rejected due to DSP doorbell set */
    + u32 nRxMsgMiss; /* DPRAM msg dropped due to overflow */
    + struct fown_struct *fileobject; /* Application's file object */
    + u16 app_id; /* Application id */
    int DspBCMsgFlag;
    - int NumOfMsg; // number of messages queued up
    + int NumOfMsg; /* number of messages queued up */
    wait_queue_head_t wait_dpram_msg;
    - struct list_head app_sqlist; // link list of msgs for applicaton on slow queue
    -} __attribute__((packed));
    + struct list_head app_sqlist; /* link list of msgs for applicaton
    + on slow queue */
    +} __packed;

    /*end of Jim*/
    +
    #define DEBUG(args...) printk(KERN_INFO args)

    #define FALSE 0
    #define TRUE 1

    -#define STATUS_SUCCESS 0
    -#define STATUS_FAILURE 0x1001
    +#define STATUS_SUCCESS 0
    +#define STATUS_FAILURE 0x1001

    #define FT1000_STATUS_CLOSING 0x01

    -#define LARGE_TIMEOUT 5000
    +#define LARGE_TIMEOUT 5000

    -#define DSPBCMSGID 0x10
    +#define DSPBCMSGID 0x10

    /* Electrabuzz specific DPRAM mapping */
    /* this is used by ft1000_usb driver - isn't that a bug? */
    #undef FT1000_DPRAM_RX_BASE
    #define FT1000_DPRAM_RX_BASE 0x1800 /* RX AREA (SlowQ) */

    -// MEMORY MAP FOR MAGNEMITE
    +/* MEMORY MAP FOR MAGNEMITE */
    /* the indexes are swapped comparing to PCMCIA - is it OK or a bug? */
    #undef FT1000_MAG_DSP_LED_INDX
    -#define FT1000_MAG_DSP_LED_INDX 0x1 /* dsp led status for PAD device */
    +#define FT1000_MAG_DSP_LED_INDX 0x1 /* dsp led status for PAD device */
    #undef FT1000_MAG_DSP_CON_STATE_INDX
    -#define FT1000_MAG_DSP_CON_STATE_INDX 0x0 /* DSP Connection Status Info */
    +#define FT1000_MAG_DSP_CON_STATE_INDX 0x0 /* DSP Connection Status Info */

    -// Maximum times trying to get ASIC out of reset
    +/* Maximum times trying to get ASIC out of reset */
    #define MAX_ASIC_RESET_CNT 20

    #define MAX_BUF_SIZE 4096

    -struct ft1000_device
    -{
    +struct ft1000_device {
    struct usb_device *dev;
    struct net_device *net;

    @@ -75,10 +76,10 @@ struct ft1000_device
    u8 bulk_in_endpointAddr;
    u8 bulk_out_endpointAddr;

    - //struct ft1000_ethernet_configuration configuration;
    + /* struct ft1000_ethernet_configuration configuration; */

    -// struct net_device_stats stats; //mbelian
    -} __attribute__ ((packed));
    + /* struct net_device_stats stats; */
    +} __packed;

    struct ft1000_debug_dirs {
    struct list_head list;
    @@ -88,90 +89,101 @@ struct ft1000_debug_dirs {
    };

    struct ft1000_info {
    - struct ft1000_device *pFt1000Dev;
    - struct net_device_stats stats;
    + struct ft1000_device *pFt1000Dev;
    + struct net_device_stats stats;

    - struct task_struct *pPollThread;
    + struct task_struct *pPollThread;

    - unsigned char fcodeldr;
    - unsigned char bootmode;
    + unsigned char fcodeldr;
    + unsigned char bootmode;
    unsigned char usbboot;
    - unsigned short dspalive;
    - u16 ASIC_ID;
    - bool fProvComplete;
    - bool fCondResetPend;
    - bool fAppMsgPend;
    - u16 DrvErrNum;
    - u16 AsicID;
    - int DspAsicReset;
    - int DeviceCreated;
    - int CardReady;
    - int NetDevRegDone;
    - u8 CardNumber;
    - u8 DeviceName[15];
    - struct ft1000_debug_dirs nodes;
    - int registered;
    - int mediastate;
    - u8 squeseqnum; // sequence number on slow queue
    - spinlock_t dpram_lock;
    - spinlock_t fifo_lock;
    - u16 fifo_cnt;
    - u8 DspVer[DSPVERSZ]; // DSP version number
    - u8 HwSerNum[HWSERNUMSZ]; // Hardware Serial Number
    - u8 Sku[SKUSZ]; // SKU
    - u8 eui64[EUISZ]; // EUI64
    - time_t ConTm; // Connection Time
    - u8 ProductMode[MODESZ];
    - u8 RfCalVer[CALVERSZ];
    - u8 RfCalDate[CALDATESZ];
    - u16 DSP_TIME[4];
    - u16 LedStat; //mbelian
    - u16 ConStat; //mbelian
    - u16 ProgConStat;
    - struct list_head prov_list;
    - int appcnt;
    + unsigned short dspalive;
    + u16 ASIC_ID;
    + bool fProvComplete;
    + bool fCondResetPend;
    + bool fAppMsgPend;
    + u16 DrvErrNum;
    + u16 AsicID;
    + int DspAsicReset;
    + int DeviceCreated;
    + int CardReady;
    + int NetDevRegDone;
    + u8 CardNumber;
    + u8 DeviceName[15];
    + struct ft1000_debug_dirs nodes;
    + int registered;
    + int mediastate;
    + u8 squeseqnum; /* sequence number on slow queue */
    + spinlock_t dpram_lock;
    + spinlock_t fifo_lock;
    + u16 fifo_cnt;
    + u8 DspVer[DSPVERSZ]; /* DSP version number */
    + u8 HwSerNum[HWSERNUMSZ]; /* Hardware Serial Number */
    + u8 Sku[SKUSZ]; /* SKU */
    + u8 eui64[EUISZ]; /* EUI64 */
    + time_t ConTm; /* Connection Time */
    + u8 ProductMode[MODESZ];
    + u8 RfCalVer[CALVERSZ];
    + u8 RfCalDate[CALDATESZ];
    + u16 DSP_TIME[4];
    + u16 LedStat; /* mbelian */
    + u16 ConStat; /* mbelian */
    + u16 ProgConStat;
    + struct list_head prov_list;
    + int appcnt;
    struct app_info_block app_info[MAX_NUM_APP];
    - u16 DSPInfoBlklen;
    - u16 DrvMsgPend;
    - int (*ft1000_reset)(struct net_device *dev);
    - u16 DSPInfoBlk[MAX_DSP_SESS_REC];
    - union {
    - u16 Rec[MAX_DSP_SESS_REC];
    - u32 MagRec[MAX_DSP_SESS_REC/2];
    - } DSPSess;
    + u16 DSPInfoBlklen;
    + u16 DrvMsgPend;
    + int (*ft1000_reset)(struct net_device *dev);
    + u16 DSPInfoBlk[MAX_DSP_SESS_REC];
    + union {
    + u16 Rec[MAX_DSP_SESS_REC];
    + u32 MagRec[MAX_DSP_SESS_REC/2];
    + } DSPSess;
    unsigned short tempbuf[32];
    char netdevname[IFNAMSIZ];
    - struct proc_dir_entry *ft1000_proc_dir; //mbelian
    + struct proc_dir_entry *ft1000_proc_dir; /* mbelian */
    };


    struct dpram_blk {
    - struct list_head list;
    - u16 *pbuffer;
    -} __attribute__ ((packed));
    + struct list_head list;
    + u16 *pbuffer;
    +} __packed;

    -int ft1000_read_register(struct ft1000_device *ft1000dev, u16* Data, u16 nRegIndx);
    -int ft1000_write_register(struct ft1000_device *ft1000dev, u16 value, u16 nRegIndx);
    -int ft1000_read_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer, u16 cnt);
    -int ft1000_write_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer, u16 cnt);
    -int ft1000_read_dpram16(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer, u8 highlow);
    -int ft1000_write_dpram16(struct ft1000_device *ft1000dev, u16 indx, u16 value, u8 highlow);
    -int fix_ft1000_read_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer);
    -int fix_ft1000_write_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer);
    +int ft1000_read_register(struct ft1000_device *ft1000dev, u16 *Data,
    + u16 nRegIndx);
    +int ft1000_write_register(struct ft1000_device *ft1000dev, u16 value,
    + u16 nRegIndx);
    +int ft1000_read_dpram32(struct ft1000_device *ft1000dev, u16 indx,
    + u8 *buffer, u16 cnt);
    +int ft1000_write_dpram32(struct ft1000_device *ft1000dev, u16 indx,
    + u8 *buffer, u16 cnt);
    +int ft1000_read_dpram16(struct ft1000_device *ft1000dev, u16 indx,
    + u8 *buffer, u8 highlow);
    +int ft1000_write_dpram16(struct ft1000_device *ft1000dev, u16 indx,
    + u16 value, u8 highlow);
    +int fix_ft1000_read_dpram32(struct ft1000_device *ft1000dev, u16 indx,
    + u8 *buffer);
    +int fix_ft1000_write_dpram32(struct ft1000_device *ft1000dev, u16 indx,
    + u8 *buffer);

    extern void *pFileStart;
    extern size_t FileLength;
    extern int numofmsgbuf;

    -int ft1000_close (struct net_device *dev);
    -u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, u32 FileLength);
    +int ft1000_close(struct net_device *dev);
    +u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart,
    + u32 FileLength);

    extern struct list_head freercvpool;
    -extern spinlock_t free_buff_lock; // lock to arbitrate free buffer list for receive command data
    +extern spinlock_t free_buff_lock; /* lock to arbitrate free buffer list
    + for receive command data */

    int ft1000_create_dev(struct ft1000_device *dev);
    void ft1000_destroy_dev(struct net_device *dev);
    -extern void card_send_command(struct ft1000_device *ft1000dev, void *ptempbuffer, int size);
    +extern void card_send_command(struct ft1000_device *ft1000dev,
    + void *ptempbuffer, int size);

    struct dpram_blk *ft1000_get_buffer(struct list_head *bufflist);
    void ft1000_free_buffer(struct dpram_blk *pdpram_blk, struct list_head *plist);
    @@ -179,12 +191,11 @@ void ft1000_free_buffer(struct dpram_blk *pdpram_blk, struct list_head *plist);
    int dsp_reload(struct ft1000_device *ft1000dev);
    int init_ft1000_netdev(struct ft1000_device *ft1000dev);
    struct usb_interface;
    -int reg_ft1000_netdev(struct ft1000_device *ft1000dev, struct usb_interface *intf);
    -int ft1000_poll(void* dev_id);
    +int reg_ft1000_netdev(struct ft1000_device *ft1000dev,
    + struct usb_interface *intf);
    +int ft1000_poll(void *dev_id);

    int ft1000_init_proc(struct net_device *dev);
    void ft1000_cleanup_proc(struct ft1000_info *info);

    -
    -
    #endif
    --
    1.7.7


    \
     
     \ /
      Last update: 2012-06-24 06:21    [W:0.037 / U:118.872 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site