Commit 83afa349 authored by Ken Depro's avatar Ken Depro Committed by Greg Kroah-Hartman

staging: unisys: Fix CamelCase for Disk Add/Remove global variables in virthba.c

This patch fixes the Disk Add/Remove (DAR) related CamelCase global
variables in virthba.c, reported by the checkpatch script:
  DARWorkQ --> dar_work_queue
  DARWorkQHead --> dar_work_queue_head
  DARWorkQLock --> dar_work_queue_lock
  DARWorkQSched --> dar_work_queue_sched
Signed-off-by: default avatarKen Depro <kenneth.depro@unisys.com>
Signed-off-by: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a57fc10e
...@@ -196,7 +196,7 @@ struct virthba_info { ...@@ -196,7 +196,7 @@ struct virthba_info {
struct virtdisk_info head; struct virtdisk_info head;
}; };
/* Work Data for DARWorkQ */ /* Work Data for dar_work_queue */
struct diskaddremove { struct diskaddremove {
u8 add; /* 0-remove, 1-add */ u8 add; /* 0-remove, 1-add */
struct Scsi_Host *shost; /* Scsi Host for this virthba instance */ struct Scsi_Host *shost; /* Scsi Host for this virthba instance */
...@@ -321,26 +321,26 @@ del_scsipending_entry(struct virthba_info *vhbainfo, uintptr_t del) ...@@ -321,26 +321,26 @@ del_scsipending_entry(struct virthba_info *vhbainfo, uintptr_t del)
return sent; return sent;
} }
/* DARWorkQ (Disk Add/Remove) */ /* dar_work_queue (Disk Add/Remove) */
static struct work_struct DARWorkQ; static struct work_struct dar_work_queue;
static struct diskaddremove *DARWorkQHead; static struct diskaddremove *dar_work_queue_head;
static spinlock_t DARWorkQLock; static spinlock_t dar_work_queue_lock;
static unsigned short DARWorkQSched; static unsigned short dar_work_queue_sched;
#define QUEUE_DISKADDREMOVE(dar) { \ #define QUEUE_DISKADDREMOVE(dar) { \
spin_lock_irqsave(&DARWorkQLock, flags); \ spin_lock_irqsave(&dar_work_queue_lock, flags); \
if (!DARWorkQHead) { \ if (!dar_work_queue_head) { \
DARWorkQHead = dar; \ dar_work_queue_head = dar; \
dar->next = NULL; \ dar->next = NULL; \
} \ } \
else { \ else { \
dar->next = DARWorkQHead; \ dar->next = dar_work_queue_head; \
DARWorkQHead = dar; \ dar_work_queue_head = dar; \
} \ } \
if (!DARWorkQSched) { \ if (!dar_work_queue_sched) { \
schedule_work(&DARWorkQ); \ schedule_work(&dar_work_queue); \
DARWorkQSched = 1; \ dar_work_queue_sched = 1; \
} \ } \
spin_unlock_irqrestore(&DARWorkQLock, flags); \ spin_unlock_irqrestore(&dar_work_queue_lock, flags); \
} }
static inline void static inline void
...@@ -368,7 +368,7 @@ SendDiskAddRemove(struct diskaddremove *dar) ...@@ -368,7 +368,7 @@ SendDiskAddRemove(struct diskaddremove *dar)
} }
/*****************************************************/ /*****************************************************/
/* DARWorkQ Handler Thread */ /* dar_work_queue Handler Thread */
/*****************************************************/ /*****************************************************/
static void static void
doDiskAddRemove(struct work_struct *work) doDiskAddRemove(struct work_struct *work)
...@@ -378,11 +378,11 @@ doDiskAddRemove(struct work_struct *work) ...@@ -378,11 +378,11 @@ doDiskAddRemove(struct work_struct *work)
int i = 0; int i = 0;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&DARWorkQLock, flags); spin_lock_irqsave(&dar_work_queue_lock, flags);
tmphead = DARWorkQHead; tmphead = dar_work_queue_head;
DARWorkQHead = NULL; dar_work_queue_head = NULL;
DARWorkQSched = 0; dar_work_queue_sched = 0;
spin_unlock_irqrestore(&DARWorkQLock, flags); spin_unlock_irqrestore(&dar_work_queue_lock, flags);
while (tmphead) { while (tmphead) {
dar = tmphead; dar = tmphead;
tmphead = dar->next; tmphead = dar->next;
...@@ -392,7 +392,7 @@ doDiskAddRemove(struct work_struct *work) ...@@ -392,7 +392,7 @@ doDiskAddRemove(struct work_struct *work)
} }
/*****************************************************/ /*****************************************************/
/* Routine to add entry to DARWorkQ */ /* Routine to add entry to dar_work_queue */
/*****************************************************/ /*****************************************************/
static void static void
process_disk_notify(struct Scsi_Host *shost, struct uiscmdrsp *cmdrsp) process_disk_notify(struct Scsi_Host *shost, struct uiscmdrsp *cmdrsp)
...@@ -1671,8 +1671,8 @@ virthba_mod_init(void) ...@@ -1671,8 +1671,8 @@ virthba_mod_init(void)
virthba_debugfs_dir, NULL, virthba_debugfs_dir, NULL,
&debugfs_enable_ints_fops); &debugfs_enable_ints_fops);
/* Initialize dar_work_queue */ /* Initialize dar_work_queue */
INIT_WORK(&DARWorkQ, doDiskAddRemove); INIT_WORK(&dar_work_queue, doDiskAddRemove);
spin_lock_init(&DARWorkQLock); spin_lock_init(&dar_work_queue_lock);
/* clear out array */ /* clear out array */
for (i = 0; i < VIRTHBASOPENMAX; i++) for (i = 0; i < VIRTHBASOPENMAX; i++)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment