openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

NFC: pn533: Re-group fields in struct pn533 

Signed-off-by: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Waldemar Rymarkiewicz 2013-04-03 08:02:10 +02:00 committed by Samuel Ortiz
parent c79490e1b5
commit d5590bba37
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/nfc/pn533.c
View File

@ -314,6 +314,7 @@ struct pn533 {
struct usb_device *udev;
struct usb_interface *interface;
struct nfc_dev *nfc_dev;
u32 device_type;
struct urb *out_urb;
struct urb *in_urb;
@ -326,19 +327,22 @@ struct pn533 {
struct work_struct poll_work;
struct work_struct mi_work;
struct work_struct tg_work;
struct timer_list listen_timer;
struct list_head cmd_queue;
struct pn533_cmd *cmd;
u8 cmd_pending;
int wq_in_error;
int cancel_listen;
struct mutex cmd_lock; /* protects cmd queue */
void *cmd_complete_mi_arg;
struct mutex cmd_lock;
struct pn533_cmd *cmd;
struct pn533_poll_modulations *poll_mod_active[PN533_POLL_MOD_MAX + 1];
u8 poll_mod_count;
u8 poll_mod_curr;
u32 poll_protocols;
u32 listen_protocols;
struct timer_list listen_timer;
int cancel_listen;
u8 *gb;
size_t gb_len;
@ -347,11 +351,6 @@ struct pn533 {
u8 tgt_active_prot;
u8 tgt_mode;
u32 device_type;
struct list_head cmd_queue;
u8 cmd_pending;
struct pn533_frame_ops *ops;
};