* [PATCH 1/8] staging: ft1000-usb: Change KERN_ERROR usage to pr_err in ft1000_usb.c.
@ 2012-07-12 21:50 Marek Belisko
2012-07-12 21:50 ` [PATCH 2/8] staging: ft1000-usb: Remove commented lines from ft1000_device Marek Belisko
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: Marek Belisko @ 2012-07-12 21:50 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Marek Belisko
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
---
drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
index 7bd7fb2..9d36c5f 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
@@ -70,7 +70,7 @@ static int ft1000_probe(struct usb_interface *interface,
ft1000dev = kzalloc(sizeof(struct ft1000_device), GFP_KERNEL);
if (!ft1000dev) {
- printk(KERN_ERR "out of memory allocating device structure\n");
+ pr_err("out of memory allocating device structure\n");
return -ENOMEM;
}
@@ -138,7 +138,7 @@ static int ft1000_probe(struct usb_interface *interface,
ret = request_firmware(&dsp_fw, "ft3000.img", &dev->dev);
if (ret < 0) {
- printk(KERN_ERR "Error request_firmware().\n");
+ pr_err("Error request_firmware().\n");
goto err_fw;
}
@@ -166,7 +166,7 @@ static int ft1000_probe(struct usb_interface *interface,
DEBUG("In probe: pft1000info=%p\n", pft1000info);
ret = dsp_reload(ft1000dev);
if (ret) {
- printk(KERN_ERR "Problem with DSP image loading\n");
+ pr_err("Problem with DSP image loading\n");
goto err_load;
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/8] staging: ft1000-usb: Remove commented lines from ft1000_device.
2012-07-12 21:50 [PATCH 1/8] staging: ft1000-usb: Change KERN_ERROR usage to pr_err in ft1000_usb.c Marek Belisko
@ 2012-07-12 21:50 ` Marek Belisko
2012-07-12 21:50 ` [PATCH 3/8] staging: ft1000-usb: Remove leading spaces from struct ft1000_info Marek Belisko
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Marek Belisko @ 2012-07-12 21:50 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Marek Belisko
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
---
drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
index 51c0847..d4f1aa1 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
@@ -74,10 +74,6 @@ struct ft1000_device
u8 bulk_in_endpointAddr;
u8 bulk_out_endpointAddr;
-
- //struct ft1000_ethernet_configuration configuration;
-
-// struct net_device_stats stats; //mbelian
} __attribute__ ((packed));
struct ft1000_debug_dirs {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/8] staging: ft1000-usb: Remove leading spaces from struct ft1000_info.
2012-07-12 21:50 [PATCH 1/8] staging: ft1000-usb: Change KERN_ERROR usage to pr_err in ft1000_usb.c Marek Belisko
2012-07-12 21:50 ` [PATCH 2/8] staging: ft1000-usb: Remove commented lines from ft1000_device Marek Belisko
@ 2012-07-12 21:50 ` Marek Belisko
2012-07-12 21:50 ` [PATCH 4/8] staging: ft1000-usb: Remove spaces from struct dpram_blk Marek Belisko
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Marek Belisko @ 2012-07-12 21:50 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Marek Belisko
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
---
drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 94 ++++++++++++------------
1 file changed, 47 insertions(+), 47 deletions(-)
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
index d4f1aa1..3f22df9 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
@@ -84,57 +84,57 @@ 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
--
1.7.9.5
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 4/8] staging: ft1000-usb: Remove spaces from struct dpram_blk.
2012-07-12 21:50 [PATCH 1/8] staging: ft1000-usb: Change KERN_ERROR usage to pr_err in ft1000_usb.c Marek Belisko
2012-07-12 21:50 ` [PATCH 2/8] staging: ft1000-usb: Remove commented lines from ft1000_device Marek Belisko
2012-07-12 21:50 ` [PATCH 3/8] staging: ft1000-usb: Remove leading spaces from struct ft1000_info Marek Belisko
@ 2012-07-12 21:50 ` Marek Belisko
2012-07-12 21:50 ` [PATCH 5/8] staging: ft1000-usb: Remove name comments from ft1000_usb.h Marek Belisko
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Marek Belisko @ 2012-07-12 21:50 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Marek Belisko
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
---
drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
index 3f22df9..06bce31 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
@@ -142,8 +142,8 @@ struct ft1000_info {
struct dpram_blk {
- struct list_head list;
- u16 *pbuffer;
+ struct list_head list;
+ u16 *pbuffer;
} __attribute__ ((packed));
int ft1000_read_register(struct ft1000_device *ft1000dev, u16* Data, u16 nRegIndx);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 5/8] staging: ft1000-usb: Remove name comments from ft1000_usb.h.
2012-07-12 21:50 [PATCH 1/8] staging: ft1000-usb: Change KERN_ERROR usage to pr_err in ft1000_usb.c Marek Belisko
` (2 preceding siblings ...)
2012-07-12 21:50 ` [PATCH 4/8] staging: ft1000-usb: Remove spaces from struct dpram_blk Marek Belisko
@ 2012-07-12 21:50 ` Marek Belisko
2012-07-12 21:50 ` [PATCH 6/8] staging: ft1000-usb: Fix lines over 80 chars Marek Belisko
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Marek Belisko @ 2012-07-12 21:50 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Marek Belisko
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
---
drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
index 06bce31..2b98754 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
@@ -1,7 +1,6 @@
#ifndef _FT1000_USB_H_
#define _FT1000_USB_H_
-/*Jim*/
#include "../ft1000.h"
#include "ft1000_ioctl.h"
#define FT1000_DRV_VER 0x01010403
@@ -27,7 +26,6 @@ struct app_info_block {
struct list_head app_sqlist; // link list of msgs for applicaton on slow queue
} __attribute__((packed));
-/*end of Jim*/
#define DEBUG(args...) printk(KERN_INFO args)
#define FALSE 0
@@ -121,8 +119,8 @@ struct ft1000_info {
u8 RfCalVer[CALVERSZ];
u8 RfCalDate[CALDATESZ];
u16 DSP_TIME[4];
- u16 LedStat; //mbelian
- u16 ConStat; //mbelian
+ u16 LedStat;
+ u16 ConStat;
u16 ProgConStat;
struct list_head prov_list;
int appcnt;
@@ -137,7 +135,7 @@ struct ft1000_info {
} DSPSess;
unsigned short tempbuf[32];
char netdevname[IFNAMSIZ];
- struct proc_dir_entry *ft1000_proc_dir; //mbelian
+ struct proc_dir_entry *ft1000_proc_dir;
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 6/8] staging: ft1000-usb: Fix lines over 80 chars.
2012-07-12 21:50 [PATCH 1/8] staging: ft1000-usb: Change KERN_ERROR usage to pr_err in ft1000_usb.c Marek Belisko
` (3 preceding siblings ...)
2012-07-12 21:50 ` [PATCH 5/8] staging: ft1000-usb: Remove name comments from ft1000_usb.h Marek Belisko
@ 2012-07-12 21:50 ` Marek Belisko
2012-07-12 21:50 ` [PATCH 7/8] staging: ft1000-usb: Replace all C99 comments with regular in ft1000_usb.h Marek Belisko
2012-07-12 21:50 ` [PATCH 8/8] staging: ft1000-usb: Fix various checkpach warnings " Marek Belisko
6 siblings, 0 replies; 8+ messages in thread
From: Marek Belisko @ 2012-07-12 21:50 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Marek Belisko
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
---
drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 33 ++++++++++++++++--------
1 file changed, 22 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
index 2b98754..60071f0 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
@@ -144,28 +144,38 @@ struct dpram_blk {
u16 *pbuffer;
} __attribute__ ((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);
+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
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);
@@ -173,7 +183,8 @@ 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 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);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 7/8] staging: ft1000-usb: Replace all C99 comments with regular in ft1000_usb.h.
2012-07-12 21:50 [PATCH 1/8] staging: ft1000-usb: Change KERN_ERROR usage to pr_err in ft1000_usb.c Marek Belisko
` (4 preceding siblings ...)
2012-07-12 21:50 ` [PATCH 6/8] staging: ft1000-usb: Fix lines over 80 chars Marek Belisko
@ 2012-07-12 21:50 ` Marek Belisko
2012-07-12 21:50 ` [PATCH 8/8] staging: ft1000-usb: Fix various checkpach warnings " Marek Belisko
6 siblings, 0 replies; 8+ messages in thread
From: Marek Belisko @ 2012-07-12 21:50 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Marek Belisko
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
---
drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 35 ++++++++++++------------
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
index 60071f0..58cc54b 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
@@ -14,16 +14,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
+ struct list_head app_sqlist; /* link list of msgs for applicaton on slow queue */
} __attribute__((packed));
#define DEBUG(args...) printk(KERN_INFO args)
@@ -45,14 +45,14 @@ struct app_info_block {
#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 */
#undef FT1000_MAG_DSP_CON_STATE_INDX
#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
@@ -106,15 +106,15 @@ struct ft1000_info {
struct ft1000_debug_dirs nodes;
int registered;
int mediastate;
- u8 squeseqnum; // sequence number on slow queue
+ 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 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];
@@ -170,7 +170,8 @@ 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);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 8/8] staging: ft1000-usb: Fix various checkpach warnings in ft1000_usb.h
2012-07-12 21:50 [PATCH 1/8] staging: ft1000-usb: Change KERN_ERROR usage to pr_err in ft1000_usb.c Marek Belisko
` (5 preceding siblings ...)
2012-07-12 21:50 ` [PATCH 7/8] staging: ft1000-usb: Replace all C99 comments with regular in ft1000_usb.h Marek Belisko
@ 2012-07-12 21:50 ` Marek Belisko
6 siblings, 0 replies; 8+ messages in thread
From: Marek Belisko @ 2012-07-12 21:50 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Marek Belisko
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
---
drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
index 58cc54b..642bb89 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
@@ -24,7 +24,7 @@ struct app_info_block {
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));
+} __packed;
#define DEBUG(args...) printk(KERN_INFO args)
@@ -57,8 +57,7 @@ struct app_info_block {
#define MAX_BUF_SIZE 4096
-struct ft1000_device
-{
+struct ft1000_device {
struct usb_device *dev;
struct net_device *net;
@@ -72,7 +71,7 @@ struct ft1000_device
u8 bulk_in_endpointAddr;
u8 bulk_out_endpointAddr;
-} __attribute__ ((packed));
+} __packed;
struct ft1000_debug_dirs {
struct list_head list;
@@ -142,10 +141,10 @@ struct ft1000_info {
struct dpram_blk {
struct list_head list;
u16 *pbuffer;
-} __attribute__ ((packed));
+} __packed;
int ft1000_read_register(struct ft1000_device *ft1000dev,
- u16* Data, u16 nRegIndx);
+ u16 *Data, u16 nRegIndx);
int ft1000_write_register(struct ft1000_device *ft1000dev,
u16 value, u16 nRegIndx);
int ft1000_read_dpram32(struct ft1000_device *ft1000dev,
@@ -165,7 +164,7 @@ extern void *pFileStart;
extern size_t FileLength;
extern int numofmsgbuf;
-int ft1000_close (struct net_device *dev);
+int ft1000_close(struct net_device *dev);
u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart,
u32 FileLength);
@@ -186,7 +185,7 @@ 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 ft1000_poll(void *dev_id);
int ft1000_init_proc(struct net_device *dev);
void ft1000_cleanup_proc(struct ft1000_info *info);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-07-12 21:52 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-12 21:50 [PATCH 1/8] staging: ft1000-usb: Change KERN_ERROR usage to pr_err in ft1000_usb.c Marek Belisko
2012-07-12 21:50 ` [PATCH 2/8] staging: ft1000-usb: Remove commented lines from ft1000_device Marek Belisko
2012-07-12 21:50 ` [PATCH 3/8] staging: ft1000-usb: Remove leading spaces from struct ft1000_info Marek Belisko
2012-07-12 21:50 ` [PATCH 4/8] staging: ft1000-usb: Remove spaces from struct dpram_blk Marek Belisko
2012-07-12 21:50 ` [PATCH 5/8] staging: ft1000-usb: Remove name comments from ft1000_usb.h Marek Belisko
2012-07-12 21:50 ` [PATCH 6/8] staging: ft1000-usb: Fix lines over 80 chars Marek Belisko
2012-07-12 21:50 ` [PATCH 7/8] staging: ft1000-usb: Replace all C99 comments with regular in ft1000_usb.h Marek Belisko
2012-07-12 21:50 ` [PATCH 8/8] staging: ft1000-usb: Fix various checkpach warnings " Marek Belisko
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.