[PATCH 05/11] staging: unisys: virthba: Remove blank lines before/after braces
This patch removes unnecessary blank lines either before opening braces or
after closing braces, as reported by the checkpatch script.
Signed-off-by: Ken Depro kenneth.de...@unisys.com
---
drivers/staging/unisys/virthba/virthba.c |4
1 file changed, 4 deletions(-)
diff --git a/drivers/staging/unisys/virthba/virthba.c
b/drivers/staging/unisys/virthba/virthba.c
index 4affc19..d326ea1 100644
--- a/drivers/staging/unisys/virthba/virthba.c
+++ b/drivers/staging/unisys/virthba/virthba.c
@@ -989,7 +989,6 @@ virthba_queue_command_lck(struct scsi_cmnd *scsicmd,
sgl = scsi_sglist(scsicmd);
for_each_sg(sgl, sg, scsi_sg_count(scsicmd), i) {
-
cmdrsp-scsi.gpi_list[i].address = sg_phys(sg);
cmdrsp-scsi.gpi_list[i].length = sg-length;
if ((i != 0) (sg-offset != 0))
@@ -1207,7 +1206,6 @@ do_scsi_nolinuxstat(struct uiscmdrsp *cmdrsp, struct
scsi_cmnd *scsicmd)
bufind += sg[i].length;
}
} else {
-
vdisk = ((struct virthba_info *)scsidev-host-hostdata)-head;
for ( ; vdisk-next; vdisk = vdisk-next) {
if ((scsidev-channel != vdisk-channel) ||
@@ -1655,7 +1653,6 @@ virthba_mod_init(void)
POSTCODE_LINUX_3(VHBA_CREATE_FAILURE_PC, error,
POSTCODE_SEVERITY_ERR);
} else {
-
/* create the debugfs directories and entries */
virthba_debugfs_dir = debugfs_create_dir(virthba, NULL);
debugfs_create_file(info, S_IRUSR, virthba_debugfs_dir,
@@ -1746,7 +1743,6 @@ virthba_mod_exit(void)
debugfs_remove_recursive(virthba_debugfs_dir);
LOGINF(Leaving virthba_mod_exit\n);
-
}
/* specify function to be run at module insertion time */
--
1.7.9.5
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 02/11] staging: unisys: virthba: Fix CamelCase variables
This patch fixes the improper CamelCase usage for variables, reported by the
checkpatch script.
Signed-off-by: Ken Depro kenneth.de...@unisys.com
---
drivers/staging/unisys/virthba/virthba.c | 122 +++---
1 file changed, 61 insertions(+), 61 deletions(-)
diff --git a/drivers/staging/unisys/virthba/virthba.c
b/drivers/staging/unisys/virthba/virthba.c
index 758a39e..a71ca37 100644
--- a/drivers/staging/unisys/virthba/virthba.c
+++ b/drivers/staging/unisys/virthba/virthba.c
@@ -107,7 +107,7 @@ static void virthba_slave_destroy(struct scsi_device
*scsidev);
static int process_incoming_rsps(void *);
static int virthba_serverup(struct virtpci_dev *virtpcidev);
static int virthba_serverdown(struct virtpci_dev *virtpcidev, u32 state);
-static void doDiskAddRemove(struct work_struct *work);
+static void do_disk_add_remove(struct work_struct *work);
static void virthba_serverdown_complete(struct work_struct *work);
static ssize_t info_debugfs_read(struct file *file, char __user *buf,
size_t len, loff_t *offset);
@@ -119,7 +119,7 @@ static ssize_t enable_ints_write(struct file *file,
/*/
static int rsltq_wait_usecs = 4000;/* Default 4ms */
-static unsigned int MaxBuffLen;
+static unsigned int max_buff_len;
/* Module options */
static char *virthba_options = NONE;
@@ -193,7 +193,7 @@ struct virthba_info {
struct virtdisk_info head;
};
-/* Work Data for DARWorkQ */
+/* Work Data for dar_work_queue */
struct diskaddremove {
u8 add; /* 0-remove, 1-add */
struct Scsi_Host *shost; /* Scsi Host for this virthba instance */
@@ -244,7 +244,7 @@ static const struct file_operations
debugfs_enable_ints_fops = {
#define VIRTHBASOPENMAX 1
/* array of open devices maintained by open() and close(); */
-static struct virthba_devices_open VirtHbasOpen[VIRTHBASOPENMAX];
+static struct virthba_devices_open virthbas_open[VIRTHBASOPENMAX];
static struct dentry *virthba_debugfs_dir;
/*/
@@ -318,30 +318,30 @@ del_scsipending_entry(struct virthba_info *vhbainfo,
uintptr_t del)
return sent;
}
-/* DARWorkQ (Disk Add/Remove) */
-static struct work_struct DARWorkQ;
-static struct diskaddremove *DARWorkQHead;
-static spinlock_t DARWorkQLock;
-static unsigned short DARWorkQSched;
+/* dar_work_queue (Disk Add/Remove) */
+static struct work_struct dar_work_queue;
+static struct diskaddremove *dar_work_queue_head;
+static spinlock_t dar_work_queue_lock;
+static unsigned short dar_work_queue_sched;
#define QUEUE_DISKADDREMOVE(dar) { \
- spin_lock_irqsave(DARWorkQLock, flags); \
- if (!DARWorkQHead) { \
- DARWorkQHead = dar; \
+ spin_lock_irqsave(dar_work_queue_lock, flags); \
+ if (!dar_work_queue_head) { \
+ dar_work_queue_head = dar; \
dar-next = NULL; \
} \
else { \
- dar-next = DARWorkQHead; \
- DARWorkQHead = dar; \
+ dar-next = dar_work_queue_head; \
+ dar_work_queue_head = dar; \
} \
- if (!DARWorkQSched) { \
- schedule_work(DARWorkQ); \
- DARWorkQSched = 1; \
+ if (!dar_work_queue_sched) { \
+ schedule_work(dar_work_queue); \
+ dar_work_queue_sched = 1; \
} \
- spin_unlock_irqrestore(DARWorkQLock, flags); \
+ spin_unlock_irqrestore(dar_work_queue_lock, flags); \
}
static inline void
-SendDiskAddRemove(struct diskaddremove *dar)
+send_disk_add_remove(struct diskaddremove *dar)
{
struct scsi_device *sdev;
int error;
@@ -365,31 +365,31 @@ SendDiskAddRemove(struct diskaddremove *dar)
}
/*/
-/* DARWorkQ Handler Thread */
+/* dar_work_queue Handler Thread */
/*/
static void
-doDiskAddRemove(struct work_struct *work)
+do_disk_add_remove(struct work_struct *work)
{
struct diskaddremove *dar;
struct diskaddremove *tmphead;
int i = 0;
unsigned long flags;
- spin_lock_irqsave(DARWorkQLock, flags);
- tmphead = DARWorkQHead;
- DARWorkQHead = NULL;
- DARWorkQSched = 0;
- spin_unlock_irqrestore(DARWorkQLock, flags);
+ spin_lock_irqsave(dar_work_queue_lock, flags);
+ tmphead = dar_work_queue_head;
+ dar_work_queue_head = NULL;
+ dar_work_queue_sched = 0;
+ spin_unlock_irqrestore(dar_work_queue_lock, flags);
while (tmphead) {
dar = tmphead;
tmphead = dar-next;
- SendDiskAddRemove(dar);
+ send_disk_add_remove(dar);
i++;
}
}
/*/
-/* Routine to add entry to DARWorkQ
[PATCH 04/11] staging: unisys: virthba: Fix logical continuation checks
This patch fixes checkpatch checks where the logical operator should be at the
end of the line above, not beginning the next line.
Signed-off-by: Ken Depro kenneth.de...@unisys.com
---
drivers/staging/unisys/virthba/virthba.c | 38 +++---
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/drivers/staging/unisys/virthba/virthba.c
b/drivers/staging/unisys/virthba/virthba.c
index deeb1e8..4affc19 100644
--- a/drivers/staging/unisys/virthba/virthba.c
+++ b/drivers/staging/unisys/virthba/virthba.c
@@ -429,8 +429,8 @@ virthba_ISR(int irq, void *dev_id)
virthbainfo-interrupts_rcvd++;
pchhdr = virthbainfo-chinfo.queueinfo-chan;
if (((readq(pchhdr-features)
- ULTRA_IO_IOVM_IS_OK_WITH_DRIVER_DISABLING_INTS) != 0)
-((readq(pchhdr-features)
+ ULTRA_IO_IOVM_IS_OK_WITH_DRIVER_DISABLING_INTS) != 0)
+((readq(pchhdr-features)
ULTRA_IO_DRIVER_DISABLES_INTS) !=
0)) {
virthbainfo-interrupts_disabled++;
@@ -807,9 +807,9 @@ virthba_abort_handler(struct scsi_cmnd *scsicmd)
scsidev = scsicmd-device;
for (vdisk = ((struct virthba_info *)scsidev-host-hostdata)-head;
vdisk-next; vdisk = vdisk-next) {
- if ((scsidev-channel == vdisk-channel)
-(scsidev-id == vdisk-id)
-(scsidev-lun == vdisk-lun)) {
+ if ((scsidev-channel == vdisk-channel)
+ (scsidev-id == vdisk-id)
+ (scsidev-lun == vdisk-lun)) {
if (atomic_read(vdisk-error_count)
VIRTHBA_ERROR_COUNT) {
atomic_inc(vdisk-error_count);
@@ -833,9 +833,9 @@ virthba_bus_reset_handler(struct scsi_cmnd *scsicmd)
scsidev = scsicmd-device;
for (vdisk = ((struct virthba_info *)scsidev-host-hostdata)-head;
vdisk-next; vdisk = vdisk-next) {
- if ((scsidev-channel == vdisk-channel)
-(scsidev-id == vdisk-id)
-(scsidev-lun == vdisk-lun)) {
+ if ((scsidev-channel == vdisk-channel)
+ (scsidev-id == vdisk-id)
+ (scsidev-lun == vdisk-lun)) {
if (atomic_read(vdisk-error_count)
VIRTHBA_ERROR_COUNT) {
atomic_inc(vdisk-error_count);
@@ -859,9 +859,9 @@ virthba_device_reset_handler(struct scsi_cmnd *scsicmd)
scsidev = scsicmd-device;
for (vdisk = ((struct virthba_info *)scsidev-host-hostdata)-head;
vdisk-next; vdisk = vdisk-next) {
- if ((scsidev-channel == vdisk-channel)
-(scsidev-id == vdisk-id)
-(scsidev-lun == vdisk-lun)) {
+ if ((scsidev-channel == vdisk-channel)
+ (scsidev-id == vdisk-id)
+ (scsidev-lun == vdisk-lun)) {
if (atomic_read(vdisk-error_count)
VIRTHBA_ERROR_COUNT) {
atomic_inc(vdisk-error_count);
@@ -1131,9 +1131,9 @@ do_scsi_linuxstat(struct uiscmdrsp *cmdrsp, struct
scsi_cmnd *scsicmd)
/* Okay see what our error_count is here */
for (vdisk = ((struct virthba_info *)scsidev-host-hostdata)-head;
vdisk-next; vdisk = vdisk-next) {
- if ((scsidev-channel != vdisk-channel)
- || (scsidev-id != vdisk-id)
- || (scsidev-lun != vdisk-lun))
+ if ((scsidev-channel != vdisk-channel) ||
+ (scsidev-id != vdisk-id) ||
+ (scsidev-lun != vdisk-lun))
continue;
if (atomic_read(vdisk-error_count) VIRTHBA_ERROR_COUNT) {
@@ -1169,8 +1169,8 @@ do_scsi_nolinuxstat(struct uiscmdrsp *cmdrsp, struct
scsi_cmnd *scsicmd)
struct virtdisk_info *vdisk;
scsidev = scsicmd-device;
- if ((cmdrsp-scsi.cmnd[0] == INQUIRY)
-(cmdrsp-scsi.bufflen = MIN_INQUIRY_RESULT_LEN)) {
+ if ((cmdrsp-scsi.cmnd[0] == INQUIRY)
+ (cmdrsp-scsi.bufflen = MIN_INQUIRY_RESULT_LEN)) {
if (cmdrsp-scsi.no_disk_result == 0)
return;
@@ -1210,9 +1210,9 @@ do_scsi_nolinuxstat(struct uiscmdrsp *cmdrsp, struct
scsi_cmnd *scsicmd)
vdisk = ((struct virthba_info *)scsidev-host-hostdata)-head;
for ( ; vdisk-next; vdisk = vdisk-next) {
- if ((scsidev-channel != vdisk-channel)
- || (scsidev-id != vdisk-id)
- || (scsidev-lun != vdisk-lun))
+ if ((scsidev-channel != vdisk-channel) ||
+ (scsidev-id != vdisk-id) ||
+ (scsidev-lun != vdisk-lun))
continue
[PATCH 07/11] staging: unisys: virthba: Change alloc calls to use var name instead of type
This patch changes a couple of kzalloc calls to pass the variable name to the
call, rather than the variable struct type. This is a result of checks
generated during the checkpatch script.
Signed-off-by: Ken Depro kenneth.de...@unisys.com
---
drivers/staging/unisys/virthba/virthba.c |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/unisys/virthba/virthba.c
b/drivers/staging/unisys/virthba/virthba.c
index 363b5eb..49225ec 100644
--- a/drivers/staging/unisys/virthba/virthba.c
+++ b/drivers/staging/unisys/virthba/virthba.c
@@ -397,7 +397,7 @@ process_disk_notify(struct Scsi_Host *shost, struct
uiscmdrsp *cmdrsp)
struct diskaddremove *dar;
unsigned long flags;
- dar = kzalloc(sizeof(struct diskaddremove), GFP_ATOMIC);
+ dar = kzalloc(sizeof(*dar), GFP_ATOMIC);
if (dar) {
dar-add = cmdrsp-disknotify.add;
dar-shost = shost;
@@ -1060,7 +1060,7 @@ virthba_slave_alloc(struct scsi_device *scsidev)
(vdisk-next-lun == scsidev-lun))
return 0;
}
- tmpvdisk = kzalloc(sizeof(struct virtdisk_info), GFP_ATOMIC);
+ tmpvdisk = kzalloc(sizeof(*tmpvdisk), GFP_ATOMIC);
if (!tmpvdisk) {/* error allocating */
LOGERR(Could not allocate memory for disk\n);
return 0;
--
1.7.9.5
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 00/11] staging: unisys: virthba: Fix checkpatch issues in virthba
This series fixes various issues in the virthba.c file that were reported by the checkpatch script. Ken Depro (11): staging: unisys: virthba: Remove unneeded spaces after casts staging: unisys: virthba: Fix CamelCase variables staging: unisys: virthba: Fix open parenthesis alignment checks staging: unisys: virthba: Fix logical continuation checks staging: unisys: virthba: Remove blank lines before/after braces staging: unisys: virthba: Fix missing braces at end of if-else statements staging: unisys: virthba: Change alloc calls to use var name instead of type staging: unisys: virthba: Fix a couple checkpatch problems staging: unisys: virthba: Fix else not useful after return warning staging: unisys: virthba: Fix warnings regarding lines over 80 characters staging: unisys: virthba: Fix a couple open parenthesis alignment issues drivers/staging/unisys/virthba/virthba.c | 399 +++--- 1 file changed, 203 insertions(+), 196 deletions(-) -- 1.7.9.5 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 03/11] staging: unisys: virthba: Fix open parenthesis alignment checks
This patch fixes the alignment should match open parenthesis checks from the
checkpatch script.
Signed-off-by: Ken Depro kenneth.de...@unisys.com
---
drivers/staging/unisys/virthba/virthba.c | 74 +++---
1 file changed, 37 insertions(+), 37 deletions(-)
diff --git a/drivers/staging/unisys/virthba/virthba.c
b/drivers/staging/unisys/virthba/virthba.c
index a71ca37..deeb1e8 100644
--- a/drivers/staging/unisys/virthba/virthba.c
+++ b/drivers/staging/unisys/virthba/virthba.c
@@ -110,9 +110,9 @@ static int virthba_serverdown(struct virtpci_dev
*virtpcidev, u32 state);
static void do_disk_add_remove(struct work_struct *work);
static void virthba_serverdown_complete(struct work_struct *work);
static ssize_t info_debugfs_read(struct file *file, char __user *buf,
- size_t len, loff_t *offset);
+size_t len, loff_t *offset);
static ssize_t enable_ints_write(struct file *file,
- const char __user *buffer, size_t count, loff_t *ppos);
+const char __user *buffer, size_t count,
loff_t *ppos);
/*/
/* Globals */
@@ -262,7 +262,7 @@ add_scsipending_entry(struct virthba_info *vhbainfo, char
cmdtype, void *new)
insert_location = (insert_location + 1) % MAX_PENDING_REQUESTS;
if (insert_location == (int)vhbainfo-nextinsert) {
LOGERR(Queue should be full. insert_location%d
Unable to find open slot for pending commands.\n,
-insert_location);
+ insert_location);
spin_unlock_irqrestore(vhbainfo-privlock, flags);
return -1;
}
@@ -300,13 +300,13 @@ del_scsipending_entry(struct virthba_info *vhbainfo,
uintptr_t del)
if (del = MAX_PENDING_REQUESTS) {
LOGERR(Invalid queue position %lu given to delete.
MAX_PENDING_REQUESTS %d\n,
-(unsigned long)del, MAX_PENDING_REQUESTS);
+ (unsigned long)del, MAX_PENDING_REQUESTS);
} else {
spin_lock_irqsave(vhbainfo-privlock, flags);
if (vhbainfo-pending[del].sent == NULL)
LOGERR(Deleting already cleared queue entry at
%lu.\n,
-(unsigned long)del);
+ (unsigned long)del);
sent = vhbainfo-pending[del].sent;
@@ -356,8 +356,8 @@ send_disk_add_remove(struct diskaddremove *dar)
dar-lun);
if (error)
LOGERR(Failed scsi_add_device:
host_no=%d[chan=%d:id=%d:lun=%d]\n,
-dar-shost-host_no, dar-channel, dar-id,
-dar-lun);
+ dar-shost-host_no, dar-channel, dar-id,
+ dar-lun);
} else
LOGERR(Failed scsi_device_lookup:[chan=%d:id=%d:lun=%d]\n,
dar-channel, dar-id, dar-lun);
@@ -407,8 +407,8 @@ process_disk_notify(struct Scsi_Host *shost, struct
uiscmdrsp *cmdrsp)
QUEUE_DISKADDREMOVE(dar);
} else {
LOGERR(kmalloc failed for dar.
host_no=%d[chan=%d:id=%d:lun=%d]\n,
-shost-host_no, cmdrsp-disknotify.channel,
-cmdrsp-disknotify.id, cmdrsp-disknotify.lun);
+ shost-host_no, cmdrsp-disknotify.channel,
+ cmdrsp-disknotify.id, cmdrsp-disknotify.lun);
}
}
@@ -501,11 +501,11 @@ virthba_probe(struct virtpci_dev *virtpcidev, const
struct pci_device_id *id)
* the max-channel value.
*/
LOGINF(virtpcidev-scsi.max.max_channel=%u, max_id=%u, max_lun=%u,
cmd_per_lun=%u, max_io_size=%u\n,
-(unsigned)virtpcidev-scsi.max.max_channel - 1,
-(unsigned)virtpcidev-scsi.max.max_id,
-(unsigned)virtpcidev-scsi.max.max_lun,
-(unsigned)virtpcidev-scsi.max.cmd_per_lun,
-(unsigned)virtpcidev-scsi.max.max_io_size);
+ (unsigned)virtpcidev-scsi.max.max_channel - 1,
+ (unsigned)virtpcidev-scsi.max.max_id,
+ (unsigned)virtpcidev-scsi.max.max_lun,
+ (unsigned)virtpcidev-scsi.max.cmd_per_lun,
+ (unsigned)virtpcidev-scsi.max.max_io_size);
scsihost-max_channel = (unsigned)virtpcidev-scsi.max.max_channel;
scsihost-max_id = (unsigned)virtpcidev-scsi.max.max_id;
scsihost-max_lun = (unsigned)virtpcidev-scsi.max.max_lun;
@@ -517,12 +517,12 @@ virthba_probe(struct virtpci_dev *virtpcidev, const
struct pci_device_id *id)
if (scsihost-sg_tablesize MAX_PHYS_INFO)
scsihost-sg_tablesize = MAX_PHYS_INFO;
LOGINF(scsihost-max_channel=%u, max_id=%u, max_lun=%llu,
cmd_per_lun=%u
[PATCH 01/11] staging: unisys: virthba: Remove unneeded spaces after casts
This patch removes all unnecessary spaces after casts, as reported by the
checkpatch script.
Signed-off-by: Ken Depro kenneth.de...@unisys.com
---
drivers/staging/unisys/virthba/virthba.c | 130 +++---
1 file changed, 65 insertions(+), 65 deletions(-)
diff --git a/drivers/staging/unisys/virthba/virthba.c
b/drivers/staging/unisys/virthba/virthba.c
index d7a629b..758a39e 100644
--- a/drivers/staging/unisys/virthba/virthba.c
+++ b/drivers/staging/unisys/virthba/virthba.c
@@ -260,7 +260,7 @@ add_scsipending_entry(struct virthba_info *vhbainfo, char
cmdtype, void *new)
insert_location = vhbainfo-nextinsert;
while (vhbainfo-pending[insert_location].sent != NULL) {
insert_location = (insert_location + 1) % MAX_PENDING_REQUESTS;
- if (insert_location == (int) vhbainfo-nextinsert) {
+ if (insert_location == (int)vhbainfo-nextinsert) {
LOGERR(Queue should be full. insert_location%d
Unable to find open slot for pending commands.\n,
insert_location);
spin_unlock_irqrestore(vhbainfo-privlock, flags);
@@ -289,7 +289,7 @@ add_scsipending_entry_with_wait(struct virthba_info
*vhbainfo, char cmdtype,
insert_location = add_scsipending_entry(vhbainfo, cmdtype, new);
}
- return (unsigned int) insert_location;
+ return (unsigned int)insert_location;
}
static void *
@@ -300,13 +300,13 @@ del_scsipending_entry(struct virthba_info *vhbainfo,
uintptr_t del)
if (del = MAX_PENDING_REQUESTS) {
LOGERR(Invalid queue position %lu given to delete.
MAX_PENDING_REQUESTS %d\n,
-(unsigned long) del, MAX_PENDING_REQUESTS);
+(unsigned long)del, MAX_PENDING_REQUESTS);
} else {
spin_lock_irqsave(vhbainfo-privlock, flags);
if (vhbainfo-pending[del].sent == NULL)
LOGERR(Deleting already cleared queue entry at
%lu.\n,
-(unsigned long) del);
+(unsigned long)del);
sent = vhbainfo-pending[del].sent;
@@ -418,7 +418,7 @@ process_disk_notify(struct Scsi_Host *shost, struct
uiscmdrsp *cmdrsp)
static irqreturn_t
virthba_ISR(int irq, void *dev_id)
{
- struct virthba_info *virthbainfo = (struct virthba_info *) dev_id;
+ struct virthba_info *virthbainfo = (struct virthba_info *)dev_id;
struct channel_header __iomem *pChannelHeader;
struct signal_queue_header __iomem *pqhdr;
u64 mask;
@@ -442,7 +442,7 @@ virthba_ISR(int irq, void *dev_id)
return IRQ_NONE;
}
pqhdr = (struct signal_queue_header __iomem *)
- ((char __iomem *) pChannelHeader +
+ ((char __iomem *)pChannelHeader +
readq(pChannelHeader-ch_space_offset)) + IOCHAN_FROM_IOPART;
writeq(readq(pqhdr-num_irq_received) + 1,
pqhdr-num_irq_received);
@@ -501,19 +501,19 @@ virthba_probe(struct virtpci_dev *virtpcidev, const
struct pci_device_id *id)
* the max-channel value.
*/
LOGINF(virtpcidev-scsi.max.max_channel=%u, max_id=%u, max_lun=%u,
cmd_per_lun=%u, max_io_size=%u\n,
-(unsigned) virtpcidev-scsi.max.max_channel - 1,
-(unsigned) virtpcidev-scsi.max.max_id,
-(unsigned) virtpcidev-scsi.max.max_lun,
-(unsigned) virtpcidev-scsi.max.cmd_per_lun,
-(unsigned) virtpcidev-scsi.max.max_io_size);
- scsihost-max_channel = (unsigned) virtpcidev-scsi.max.max_channel;
- scsihost-max_id = (unsigned) virtpcidev-scsi.max.max_id;
- scsihost-max_lun = (unsigned) virtpcidev-scsi.max.max_lun;
- scsihost-cmd_per_lun = (unsigned) virtpcidev-scsi.max.cmd_per_lun;
+(unsigned)virtpcidev-scsi.max.max_channel - 1,
+(unsigned)virtpcidev-scsi.max.max_id,
+(unsigned)virtpcidev-scsi.max.max_lun,
+(unsigned)virtpcidev-scsi.max.cmd_per_lun,
+(unsigned)virtpcidev-scsi.max.max_io_size);
+ scsihost-max_channel = (unsigned)virtpcidev-scsi.max.max_channel;
+ scsihost-max_id = (unsigned)virtpcidev-scsi.max.max_id;
+ scsihost-max_lun = (unsigned)virtpcidev-scsi.max.max_lun;
+ scsihost-cmd_per_lun = (unsigned)virtpcidev-scsi.max.cmd_per_lun;
scsihost-max_sectors =
- (unsigned short) (virtpcidev-scsi.max.max_io_size 9);
+ (unsigned short)(virtpcidev-scsi.max.max_io_size 9);
scsihost-sg_tablesize =
- (unsigned short) (virtpcidev-scsi.max.max_io_size / PAGE_SIZE);
+ (unsigned short)(virtpcidev-scsi.max.max_io_size / PAGE_SIZE);
if (scsihost-sg_tablesize MAX_PHYS_INFO)
scsihost-sg_tablesize = MAX_PHYS_INFO;
LOGINF(scsihost-max_channel=%u, max_id=%u, max_lun=%llu,
cmd_per_lun=%u, max_sectors=%hu, sg_tablesize=%hu\n
[PATCH 11/11] staging: unisys: virthba: Fix a couple open parenthesis alignment issues
This patch fixes a couple checkpatch checks where alignment of the parameters
did not match the open parenthesis of the function.
Signed-off-by: Ken Depro kenneth.de...@unisys.com
---
drivers/staging/unisys/virthba/virthba.c |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/unisys/virthba/virthba.c
b/drivers/staging/unisys/virthba/virthba.c
index e746c03..debb5e6 100644
--- a/drivers/staging/unisys/virthba/virthba.c
+++ b/drivers/staging/unisys/virthba/virthba.c
@@ -1295,7 +1295,8 @@ drain_queue(struct virthba_info *virthbainfo, struct
chaninfo *dc,
* deletion
*/
scsicmd = del_scsipending_entry(virthbainfo,
- (uintptr_t)cmdrsp-scsi.scsicmd);
+ (uintptr_t)
+cmdrsp-scsi.scsicmd);
if (!scsicmd)
break;
/* complete the orig cmd */
@@ -1314,7 +1315,8 @@ drain_queue(struct virthba_info *virthbainfo, struct
chaninfo *dc,
process_disk_notify(shost, cmdrsp);
} else if (cmdrsp-cmdtype == CMD_VDISKMGMT_TYPE) {
if (!del_scsipending_entry(virthbainfo,
- (uintptr_t)cmdrsp-vdiskmgmt.scsicmd))
+ (uintptr_t)
+ cmdrsp-vdiskmgmt.scsicmd))
break;
complete_vdiskmgmt_command(cmdrsp);
} else {
--
1.7.9.5
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 10/11] staging: unisys: virthba: Fix warnings regarding lines over 80 characters
This patch fixes warnings generated by checkpatch script regarding lines over
80 characters long.
Signed-off-by: Ken Depro kenneth.de...@unisys.com
---
drivers/staging/unisys/virthba/virthba.c | 40 --
1 file changed, 22 insertions(+), 18 deletions(-)
diff --git a/drivers/staging/unisys/virthba/virthba.c
b/drivers/staging/unisys/virthba/virthba.c
index c9110a8..e746c03 100644
--- a/drivers/staging/unisys/virthba/virthba.c
+++ b/drivers/staging/unisys/virthba/virthba.c
@@ -85,7 +85,8 @@ static int virthba_host_reset_handler(struct scsi_cmnd
*scsicmd);
static const char *virthba_get_info(struct Scsi_Host *shp);
static int virthba_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
static int virthba_queue_command_lck(struct scsi_cmnd *scsicmd,
-void (*virthba_cmnd_done)(struct scsi_cmnd
*));
+void (*virthba_cmnd_done)
+ (struct scsi_cmnd *));
static const struct x86_cpu_id unisys_spar_ids[] = {
{ X86_VENDOR_INTEL, 6, 62, X86_FEATURE_ANY },
@@ -112,7 +113,8 @@ static void virthba_serverdown_complete(struct work_struct
*work);
static ssize_t info_debugfs_read(struct file *file, char __user *buf,
size_t len, loff_t *offset);
static ssize_t enable_ints_write(struct file *file,
-const char __user *buffer, size_t count,
loff_t *ppos);
+const char __user *buffer, size_t count,
+loff_t *ppos);
/*/
/* Globals */
@@ -284,7 +286,7 @@ add_scsipending_entry_with_wait(struct virthba_info
*vhbainfo, char cmdtype,
int insert_location = add_scsipending_entry(vhbainfo, cmdtype, new);
while (insert_location == -1) {
- LOGERR(Failed to find empty queue slot. Waiting to try
again\n);
+ LOGERR(Failed to find empty queue slot; will try again\n);
set_current_state(TASK_INTERRUPTIBLE);
schedule_timeout(msecs_to_jiffies(10));
insert_location = add_scsipending_entry(vhbainfo, cmdtype, new);
@@ -306,7 +308,7 @@ del_scsipending_entry(struct virthba_info *vhbainfo,
uintptr_t del)
spin_lock_irqsave(vhbainfo-privlock, flags);
if (vhbainfo-pending[del].sent == NULL)
- LOGERR(Deleting already cleared queue entry at
%lu.\n,
+ LOGERR(Deleting prior cleared queue entry @ %lu\n,
(unsigned long)del);
sent = vhbainfo-pending[del].sent;
@@ -407,7 +409,7 @@ process_disk_notify(struct Scsi_Host *shost, struct
uiscmdrsp *cmdrsp)
dar-lun = cmdrsp-disknotify.lun;
QUEUE_DISKADDREMOVE(dar);
} else {
- LOGERR(kmalloc failed for dar.
host_no=%d[chan=%d:id=%d:lun=%d]\n,
+ LOGERR(dar kzalloc failed. host_no=%d[chan=%d:id=%d:lun=%d]\n,
shost-host_no, cmdrsp-disknotify.channel,
cmdrsp-disknotify.id, cmdrsp-disknotify.lun);
}
@@ -522,8 +524,8 @@ virthba_probe(struct virtpci_dev *virtpcidev, const struct
pci_device_id *id)
scsihost-cmd_per_lun, scsihost-max_sectors,
scsihost-sg_tablesize);
LOGINF(scsihost-can_queue=%u, scsihost-cmd_per_lun=%u,
max_sectors=%hu, sg_tablesize=%hu\n,
- scsihost-can_queue, scsihost-cmd_per_lun,
scsihost-max_sectors,
- scsihost-sg_tablesize);
+ scsihost-can_queue, scsihost-cmd_per_lun,
+ scsihost-max_sectors, scsihost-sg_tablesize);
DBGINF(calling scsi_add_host\n);
@@ -616,7 +618,7 @@ virthba_probe(struct virtpci_dev *virtpcidev, const struct
pci_device_id *id)
rsp = request_irq(virthbainfo-interrupt_vector, handler, IRQF_SHARED,
scsihost-hostt-name, virthbainfo);
if (rsp != 0) {
- LOGERR(request_irq(%d) uislib_virthba_ISR request failed with
rsp=%d\n,
+ LOGERR(req_irq(%d) uislib_virthba_ISR req failed; rsp=%d\n,
virthbainfo-interrupt_vector, rsp);
virthbainfo-interrupt_vector = -1;
POSTCODE_LINUX_2(VHBA_PROBE_FAILURE_PC, POSTCODE_SEVERITY_ERR);
@@ -993,12 +995,12 @@ virthba_queue_command_lck(struct scsi_cmnd *scsicmd,
cmdrsp-scsi.gpi_list[i].address = sg_phys(sg);
cmdrsp-scsi.gpi_list[i].length = sg-length;
if ((i != 0) (sg-offset != 0))
- LOGINF(Offset on a sg_entry other than zero
=%d.\n,
+ LOGINF(Offset on sg_entry not 0=%d\n,
sg-offset);
}
if (sg_failed
[PATCH 06/11] staging: unisys: virthba: Fix missing braces at end of if-else statements
This patch fixes checkpatch warnings that resulted from the else portion of
if-else statements missing braces, so that it conforms with the rest of the
statement.
Signed-off-by: Ken Depro kenneth.de...@unisys.com
---
drivers/staging/unisys/virthba/virthba.c |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/unisys/virthba/virthba.c
b/drivers/staging/unisys/virthba/virthba.c
index d326ea1..363b5eb 100644
--- a/drivers/staging/unisys/virthba/virthba.c
+++ b/drivers/staging/unisys/virthba/virthba.c
@@ -1314,8 +1314,9 @@ drain_queue(struct virthba_info *virthbainfo, struct
chaninfo *dc,
(uintptr_t)cmdrsp-vdiskmgmt.scsicmd))
break;
complete_vdiskmgmt_command(cmdrsp);
- } else
+ } else {
LOGERR(Invalid cmdtype %d\n, cmdrsp-cmdtype);
+ }
/* cmdrsp is now available for reuse */
}
}
@@ -1597,8 +1598,9 @@ virthba_serverdown(struct virtpci_dev *virtpcidev, u32
state)
} else if (virthbainfo-serverchangingstate) {
LOGERR(Server already processing change state message\n);
return 0;
- } else
+ } else {
LOGERR(Server already down, but another server down message
received.);
+ }
return 1;
}
--
1.7.9.5
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 09/11] staging: unisys: virthba: Fix else not useful after return warning
This patch fixes a warning generated during the checkpatch script that stated
else not useful after return. I modified the code to return a designated
status at the end of the function, and replaced the return statement in the
else if to set the status accordingly.
Signed-off-by: Ken Depro kenneth.de...@unisys.com
---
drivers/staging/unisys/virthba/virthba.c |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/unisys/virthba/virthba.c
b/drivers/staging/unisys/virthba/virthba.c
index dd361cd..c9110a8 100644
--- a/drivers/staging/unisys/virthba/virthba.c
+++ b/drivers/staging/unisys/virthba/virthba.c
@@ -1584,6 +1584,8 @@ virthba_serverdown_complete(struct work_struct *work)
static int
virthba_serverdown(struct virtpci_dev *virtpcidev, u32 state)
{
+ int stat = 1;
+
struct virthba_info *virthbainfo =
(struct virthba_info *)((struct Scsi_Host *)virtpcidev-scsi.
scsihost)-hostdata;
@@ -1598,12 +1600,12 @@ virthba_serverdown(struct virtpci_dev *virtpcidev, u32
state)
virthbainfo-serverdown_completion);
} else if (virthbainfo-serverchangingstate) {
LOGERR(Server already processing change state message\n);
- return 0;
+ stat = 0;
} else {
LOGERR(Server already down, but another server down message
received.);
}
- return 1;
+ return stat;
}
/*/
--
1.7.9.5
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 08/11] staging: unisys: virthba: Fix a couple checkpatch problems
This patch fixes a couple small issues reported by the checkpatch script:
Adds a blank line after a struct definition.
Removes unnecessary parentheses surrounding a struct member.
Signed-off-by: Ken Depro kenneth.de...@unisys.com
---
drivers/staging/unisys/virthba/virthba.c |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/unisys/virthba/virthba.c
b/drivers/staging/unisys/virthba/virthba.c
index 49225ec..dd361cd 100644
--- a/drivers/staging/unisys/virthba/virthba.c
+++ b/drivers/staging/unisys/virthba/virthba.c
@@ -165,6 +165,7 @@ struct virtdisk_info {
atomic_t error_count;
struct virtdisk_info *next;
};
+
/* Each Scsi_Host has a host_data area that contains this struct. */
struct virthba_info {
struct Scsi_Host *scsihost;
@@ -1534,7 +1535,7 @@ virthba_serverdown_complete(struct work_struct *work)
/* Fail Commands that weren't completed */
spin_lock_irqsave(virthbainfo-privlock, flags);
for (i = 0; i MAX_PENDING_REQUESTS; i++) {
- pendingdel = (virthbainfo-pending[i]);
+ pendingdel = virthbainfo-pending[i];
switch (pendingdel-cmdtype) {
case CMD_SCSI_TYPE:
scsicmd = (struct scsi_cmnd *)pendingdel-sent;
--
1.7.9.5
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: unisys: fix CamelCase methods/variables in virthba.c
This patch fixes the CamelCase checks for methods/variables in
virthba.c found with the checkpatch script.
Signed-off-by: Ken Depro kenneth.de...@unisys.com
---
drivers/staging/unisys/virthba/virthba.c | 122 +++---
1 file changed, 61 insertions(+), 61 deletions(-)
diff --git a/drivers/staging/unisys/virthba/virthba.c
b/drivers/staging/unisys/virthba/virthba.c
index d7a629b..f537754 100644
--- a/drivers/staging/unisys/virthba/virthba.c
+++ b/drivers/staging/unisys/virthba/virthba.c
@@ -107,7 +107,7 @@ static void virthba_slave_destroy(struct scsi_device
*scsidev);
static int process_incoming_rsps(void *);
static int virthba_serverup(struct virtpci_dev *virtpcidev);
static int virthba_serverdown(struct virtpci_dev *virtpcidev, u32 state);
-static void doDiskAddRemove(struct work_struct *work);
+static void do_disk_add_remove(struct work_struct *work);
static void virthba_serverdown_complete(struct work_struct *work);
static ssize_t info_debugfs_read(struct file *file, char __user *buf,
size_t len, loff_t *offset);
@@ -119,7 +119,7 @@ static ssize_t enable_ints_write(struct file *file,
/*/
static int rsltq_wait_usecs = 4000;/* Default 4ms */
-static unsigned int MaxBuffLen;
+static unsigned int max_buff_len;
/* Module options */
static char *virthba_options = NONE;
@@ -193,7 +193,7 @@ struct virthba_info {
struct virtdisk_info head;
};
-/* Work Data for DARWorkQ */
+/* Work Data for dar_work_queue */
struct diskaddremove {
u8 add; /* 0-remove, 1-add */
struct Scsi_Host *shost; /* Scsi Host for this virthba instance */
@@ -244,7 +244,7 @@ static const struct file_operations
debugfs_enable_ints_fops = {
#define VIRTHBASOPENMAX 1
/* array of open devices maintained by open() and close(); */
-static struct virthba_devices_open VirtHbasOpen[VIRTHBASOPENMAX];
+static struct virthba_devices_open virthbas_open[VIRTHBASOPENMAX];
static struct dentry *virthba_debugfs_dir;
/*/
@@ -318,30 +318,30 @@ del_scsipending_entry(struct virthba_info *vhbainfo,
uintptr_t del)
return sent;
}
-/* DARWorkQ (Disk Add/Remove) */
-static struct work_struct DARWorkQ;
-static struct diskaddremove *DARWorkQHead;
-static spinlock_t DARWorkQLock;
-static unsigned short DARWorkQSched;
+/* dar_work_q (Disk Add/Remove) */
+static struct work_struct dar_work_queue;
+static struct diskaddremove *dar_work_queue_head;
+static spinlock_t dar_work_queue_lock;
+static unsigned short dar_work_queue_sched;
#define QUEUE_DISKADDREMOVE(dar) { \
- spin_lock_irqsave(DARWorkQLock, flags); \
- if (!DARWorkQHead) { \
- DARWorkQHead = dar; \
+ spin_lock_irqsave(dar_work_queue_lock, flags); \
+ if (!dar_work_queue_head) { \
+ dar_work_queue_head = dar; \
dar-next = NULL; \
} \
else { \
- dar-next = DARWorkQHead; \
- DARWorkQHead = dar; \
+ dar-next = dar_work_queue_head; \
+ dar_work_queue_head = dar; \
} \
- if (!DARWorkQSched) { \
- schedule_work(DARWorkQ); \
- DARWorkQSched = 1; \
+ if (!dar_work_queue_sched) { \
+ schedule_work(dar_work_queue); \
+ dar_work_queue_sched = 1; \
} \
- spin_unlock_irqrestore(DARWorkQLock, flags); \
+ spin_unlock_irqrestore(dar_work_queue_lock, flags); \
}
static inline void
-SendDiskAddRemove(struct diskaddremove *dar)
+send_disk_add_remove(struct diskaddremove *dar)
{
struct scsi_device *sdev;
int error;
@@ -365,31 +365,31 @@ SendDiskAddRemove(struct diskaddremove *dar)
}
/*/
-/* DARWorkQ Handler Thread */
+/* dar_work_queue Handler Thread */
/*/
static void
-doDiskAddRemove(struct work_struct *work)
+do_disk_add_remove(struct work_struct *work)
{
struct diskaddremove *dar;
struct diskaddremove *tmphead;
int i = 0;
unsigned long flags;
- spin_lock_irqsave(DARWorkQLock, flags);
- tmphead = DARWorkQHead;
- DARWorkQHead = NULL;
- DARWorkQSched = 0;
- spin_unlock_irqrestore(DARWorkQLock, flags);
+ spin_lock_irqsave(dar_work_queue_lock, flags);
+ tmphead = dar_work_queue_head;
+ dar_work_queue_head = NULL;
+ dar_work_queue_sched = 0;
+ spin_unlock_irqrestore(dar_work_queue_lock, flags);
while (tmphead) {
dar = tmphead;
tmphead = dar-next;
- SendDiskAddRemove(dar);
+ send_disk_add_remove(dar);
i++;
}
}
/*/
-/* Routine to add entry to DARWorkQ
[PATCH] staging: unisys: Remove chanstub files While fixing the CamelCase checks for the functions in the chanstub source and header files, I discovered they are no longer being used. This patch remov
Signed-off-by: Ken Depro kenneth.de...@unisys.com
---
drivers/staging/unisys/channels/Makefile |2 +-
drivers/staging/unisys/channels/chanstub.c | 75
drivers/staging/unisys/channels/chanstub.h | 23 -
drivers/staging/unisys/uislib/uislib.c |1 -
drivers/staging/unisys/uislib/uisqueue.c |2 -
5 files changed, 1 insertion(+), 102 deletions(-)
delete mode 100644 drivers/staging/unisys/channels/chanstub.c
delete mode 100644 drivers/staging/unisys/channels/chanstub.h
diff --git a/drivers/staging/unisys/channels/Makefile
b/drivers/staging/unisys/channels/Makefile
index adc1842..0929a8e 100644
--- a/drivers/staging/unisys/channels/Makefile
+++ b/drivers/staging/unisys/channels/Makefile
@@ -4,7 +4,7 @@
obj-$(CONFIG_UNISYS_CHANNELSTUB) += visorchannelstub.o
-visorchannelstub-y := channel.o chanstub.o
+visorchannelstub-y := channel.o
ccflags-y += -Idrivers/staging/unisys/include
ccflags-y += -Idrivers/staging/unisys/common-spar/include
diff --git a/drivers/staging/unisys/channels/chanstub.c
b/drivers/staging/unisys/channels/chanstub.c
deleted file mode 100644
index b6fd126..000
--- a/drivers/staging/unisys/channels/chanstub.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright (C) 2010 - 2013 UNISYS CORPORATION
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
- * NON INFRINGEMENT. See the GNU General Public License for more
- * details.
- */
-
-#define EXPORT_SYMTAB
-#include linux/kernel.h
-#ifdef CONFIG_MODVERSIONS
-#include config/modversions.h
-#endif
-#include linux/module.h
-#include linux/init.h/* for module_init and module_exit */
-#include linux/slab.h/* for memcpy */
-#include linux/types.h
-
-#include channel.h
-#include chanstub.h
-#include timskmod.h
-#include version.h
-
-static __init int
-channel_mod_init(void)
-{
- if (!unisys_spar_platform)
- return -ENODEV;
- return 0;
-}
-
-static __exit void
-channel_mod_exit(void)
-{
-}
-
-unsigned char
-SignalInsert_withLock(struct channel_header __iomem *pChannel, u32 Queue,
- void *pSignal, spinlock_t *lock)
-{
- unsigned char result;
- unsigned long flags;
-
- spin_lock_irqsave(lock, flags);
- result = spar_signal_insert(pChannel, Queue, pSignal);
- spin_unlock_irqrestore(lock, flags);
- return result;
-}
-
-unsigned char
-SignalRemove_withLock(struct channel_header __iomem *pChannel, u32 Queue,
- void *pSignal, spinlock_t *lock)
-{
- unsigned char result;
-
- spin_lock(lock);
- result = spar_signal_remove(pChannel, Queue, pSignal);
- spin_unlock(lock);
- return result;
-}
-
-module_init(channel_mod_init);
-module_exit(channel_mod_exit);
-
-MODULE_LICENSE(GPL);
-MODULE_AUTHOR(Bryan Glaudel);
-MODULE_ALIAS(uischan);
- /* this is extracted during depmod and kept in modules.dep */
diff --git a/drivers/staging/unisys/channels/chanstub.h
b/drivers/staging/unisys/channels/chanstub.h
deleted file mode 100644
index 1531759..000
--- a/drivers/staging/unisys/channels/chanstub.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright (C) 2010 - 2013 UNISYS CORPORATION
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
- * NON INFRINGEMENT. See the GNU General Public License for more
- * details.
- */
-
-#ifndef __CHANSTUB_H__
-#define __CHANSTUB_H__
-unsigned char SignalInsert_withLock(struct channel_header __iomem *pChannel,
- u32 Queue, void *pSignal, spinlock_t *lock);
-unsigned char SignalRemove_withLock(struct channel_header __iomem *pChannel,
- u32 Queue, void *pSignal, spinlock_t *lock);
-
-#endif
diff --git a/drivers/staging/unisys/uislib/uislib.c
b/drivers/staging/unisys/uislib/uislib.c
index 7c87452..9bcaa0f 100644
--- a/drivers/staging/unisys/uislib/uislib.c
+++ b/drivers/staging/unisys/uislib/uislib.c
@@ -41,7 +41,6 @@
#include sparstop.h
#include visorchipset.h
-#include chanstub.h
#include version.h
#include guestlinuxdebug.h
diff --git a/drivers/staging/unisys
[PATCH] staging: unisys: Remove chanstub files
While fixing the CamelCase checks for the functions in the chanstub
source and header files, I discovered they are no longer being used.
This patch removes the two chanstub files, and deletes the #include
of these files from uislib.c and uisqueue.c. It also removes the
chanstub.o from the channels Makefile.
Signed-off-by: Ken Depro kenneth.de...@unisys.com
---
drivers/staging/unisys/channels/Makefile |2 +-
drivers/staging/unisys/channels/chanstub.c | 75
drivers/staging/unisys/channels/chanstub.h | 23 -
drivers/staging/unisys/uislib/uislib.c |1 -
drivers/staging/unisys/uislib/uisqueue.c |2 -
5 files changed, 1 insertion(+), 102 deletions(-)
delete mode 100644 drivers/staging/unisys/channels/chanstub.c
delete mode 100644 drivers/staging/unisys/channels/chanstub.h
diff --git a/drivers/staging/unisys/channels/Makefile
b/drivers/staging/unisys/channels/Makefile
index adc1842..0929a8e 100644
--- a/drivers/staging/unisys/channels/Makefile
+++ b/drivers/staging/unisys/channels/Makefile
@@ -4,7 +4,7 @@
obj-$(CONFIG_UNISYS_CHANNELSTUB) += visorchannelstub.o
-visorchannelstub-y := channel.o chanstub.o
+visorchannelstub-y := channel.o
ccflags-y += -Idrivers/staging/unisys/include
ccflags-y += -Idrivers/staging/unisys/common-spar/include
diff --git a/drivers/staging/unisys/channels/chanstub.c
b/drivers/staging/unisys/channels/chanstub.c
deleted file mode 100644
index b6fd126..000
--- a/drivers/staging/unisys/channels/chanstub.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright (C) 2010 - 2013 UNISYS CORPORATION
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
- * NON INFRINGEMENT. See the GNU General Public License for more
- * details.
- */
-
-#define EXPORT_SYMTAB
-#include linux/kernel.h
-#ifdef CONFIG_MODVERSIONS
-#include config/modversions.h
-#endif
-#include linux/module.h
-#include linux/init.h/* for module_init and module_exit */
-#include linux/slab.h/* for memcpy */
-#include linux/types.h
-
-#include channel.h
-#include chanstub.h
-#include timskmod.h
-#include version.h
-
-static __init int
-channel_mod_init(void)
-{
- if (!unisys_spar_platform)
- return -ENODEV;
- return 0;
-}
-
-static __exit void
-channel_mod_exit(void)
-{
-}
-
-unsigned char
-SignalInsert_withLock(struct channel_header __iomem *pChannel, u32 Queue,
- void *pSignal, spinlock_t *lock)
-{
- unsigned char result;
- unsigned long flags;
-
- spin_lock_irqsave(lock, flags);
- result = spar_signal_insert(pChannel, Queue, pSignal);
- spin_unlock_irqrestore(lock, flags);
- return result;
-}
-
-unsigned char
-SignalRemove_withLock(struct channel_header __iomem *pChannel, u32 Queue,
- void *pSignal, spinlock_t *lock)
-{
- unsigned char result;
-
- spin_lock(lock);
- result = spar_signal_remove(pChannel, Queue, pSignal);
- spin_unlock(lock);
- return result;
-}
-
-module_init(channel_mod_init);
-module_exit(channel_mod_exit);
-
-MODULE_LICENSE(GPL);
-MODULE_AUTHOR(Bryan Glaudel);
-MODULE_ALIAS(uischan);
- /* this is extracted during depmod and kept in modules.dep */
diff --git a/drivers/staging/unisys/channels/chanstub.h
b/drivers/staging/unisys/channels/chanstub.h
deleted file mode 100644
index 1531759..000
--- a/drivers/staging/unisys/channels/chanstub.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright (C) 2010 - 2013 UNISYS CORPORATION
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
- * NON INFRINGEMENT. See the GNU General Public License for more
- * details.
- */
-
-#ifndef __CHANSTUB_H__
-#define __CHANSTUB_H__
-unsigned char SignalInsert_withLock(struct channel_header __iomem *pChannel,
- u32 Queue, void *pSignal, spinlock_t *lock);
-unsigned char SignalRemove_withLock(struct channel_header __iomem *pChannel,
- u32 Queue, void *pSignal, spinlock_t *lock);
-
-#endif
diff --git a/drivers/staging/unisys/uislib/uislib.c
b/drivers/staging
[PATCH] staging: unisys: Remove unnecessary spaces after casts in virthba.c
This patch removes all of the unnecessary spaces after casts within
the virthba.c file. The checkpatch script was run again after these
changes, and no remove spaces after casts checks were generated.
Signed-off-by: Ken Depro kenneth.de...@unisys.com
---
drivers/staging/unisys/virthba/virthba.c | 130 +++---
1 file changed, 65 insertions(+), 65 deletions(-)
diff --git a/drivers/staging/unisys/virthba/virthba.c
b/drivers/staging/unisys/virthba/virthba.c
index d7a629b..758a39e 100644
--- a/drivers/staging/unisys/virthba/virthba.c
+++ b/drivers/staging/unisys/virthba/virthba.c
@@ -260,7 +260,7 @@ add_scsipending_entry(struct virthba_info *vhbainfo, char
cmdtype, void *new)
insert_location = vhbainfo-nextinsert;
while (vhbainfo-pending[insert_location].sent != NULL) {
insert_location = (insert_location + 1) % MAX_PENDING_REQUESTS;
- if (insert_location == (int) vhbainfo-nextinsert) {
+ if (insert_location == (int)vhbainfo-nextinsert) {
LOGERR(Queue should be full. insert_location%d
Unable to find open slot for pending commands.\n,
insert_location);
spin_unlock_irqrestore(vhbainfo-privlock, flags);
@@ -289,7 +289,7 @@ add_scsipending_entry_with_wait(struct virthba_info
*vhbainfo, char cmdtype,
insert_location = add_scsipending_entry(vhbainfo, cmdtype, new);
}
- return (unsigned int) insert_location;
+ return (unsigned int)insert_location;
}
static void *
@@ -300,13 +300,13 @@ del_scsipending_entry(struct virthba_info *vhbainfo,
uintptr_t del)
if (del = MAX_PENDING_REQUESTS) {
LOGERR(Invalid queue position %lu given to delete.
MAX_PENDING_REQUESTS %d\n,
-(unsigned long) del, MAX_PENDING_REQUESTS);
+(unsigned long)del, MAX_PENDING_REQUESTS);
} else {
spin_lock_irqsave(vhbainfo-privlock, flags);
if (vhbainfo-pending[del].sent == NULL)
LOGERR(Deleting already cleared queue entry at
%lu.\n,
-(unsigned long) del);
+(unsigned long)del);
sent = vhbainfo-pending[del].sent;
@@ -418,7 +418,7 @@ process_disk_notify(struct Scsi_Host *shost, struct
uiscmdrsp *cmdrsp)
static irqreturn_t
virthba_ISR(int irq, void *dev_id)
{
- struct virthba_info *virthbainfo = (struct virthba_info *) dev_id;
+ struct virthba_info *virthbainfo = (struct virthba_info *)dev_id;
struct channel_header __iomem *pChannelHeader;
struct signal_queue_header __iomem *pqhdr;
u64 mask;
@@ -442,7 +442,7 @@ virthba_ISR(int irq, void *dev_id)
return IRQ_NONE;
}
pqhdr = (struct signal_queue_header __iomem *)
- ((char __iomem *) pChannelHeader +
+ ((char __iomem *)pChannelHeader +
readq(pChannelHeader-ch_space_offset)) + IOCHAN_FROM_IOPART;
writeq(readq(pqhdr-num_irq_received) + 1,
pqhdr-num_irq_received);
@@ -501,19 +501,19 @@ virthba_probe(struct virtpci_dev *virtpcidev, const
struct pci_device_id *id)
* the max-channel value.
*/
LOGINF(virtpcidev-scsi.max.max_channel=%u, max_id=%u, max_lun=%u,
cmd_per_lun=%u, max_io_size=%u\n,
-(unsigned) virtpcidev-scsi.max.max_channel - 1,
-(unsigned) virtpcidev-scsi.max.max_id,
-(unsigned) virtpcidev-scsi.max.max_lun,
-(unsigned) virtpcidev-scsi.max.cmd_per_lun,
-(unsigned) virtpcidev-scsi.max.max_io_size);
- scsihost-max_channel = (unsigned) virtpcidev-scsi.max.max_channel;
- scsihost-max_id = (unsigned) virtpcidev-scsi.max.max_id;
- scsihost-max_lun = (unsigned) virtpcidev-scsi.max.max_lun;
- scsihost-cmd_per_lun = (unsigned) virtpcidev-scsi.max.cmd_per_lun;
+(unsigned)virtpcidev-scsi.max.max_channel - 1,
+(unsigned)virtpcidev-scsi.max.max_id,
+(unsigned)virtpcidev-scsi.max.max_lun,
+(unsigned)virtpcidev-scsi.max.cmd_per_lun,
+(unsigned)virtpcidev-scsi.max.max_io_size);
+ scsihost-max_channel = (unsigned)virtpcidev-scsi.max.max_channel;
+ scsihost-max_id = (unsigned)virtpcidev-scsi.max.max_id;
+ scsihost-max_lun = (unsigned)virtpcidev-scsi.max.max_lun;
+ scsihost-cmd_per_lun = (unsigned)virtpcidev-scsi.max.cmd_per_lun;
scsihost-max_sectors =
- (unsigned short) (virtpcidev-scsi.max.max_io_size 9);
+ (unsigned short)(virtpcidev-scsi.max.max_io_size 9);
scsihost-sg_tablesize =
- (unsigned short) (virtpcidev-scsi.max.max_io_size / PAGE_SIZE);
+ (unsigned short)(virtpcidev-scsi.max.max_io_size / PAGE_SIZE);
if (scsihost-sg_tablesize MAX_PHYS_INFO)
scsihost-sg_tablesize = MAX_PHYS_INFO
[PATCH] staging: unisys: Remove unnecessary spaces after casts in virthba.c
From: Ken Depro kenneth.de...@unisys.com
This patch removes unneeded spaces after casts within the virthba.c
file. The checkpatch script was run after these changes, and no
remove spaces after casts checks were generated.
Later patches will fix the other checkpatch warnings/checks.
Conflicts:
drivers/staging/unisys/virthba/virthba.c
Signed-off-by: Ken Depro kenneth.de...@unisys.com
---
drivers/staging/unisys/virthba/virthba.c | 134 +++---
1 files changed, 67 insertions(+), 67 deletions(-)
diff --git a/drivers/staging/unisys/virthba/virthba.c
b/drivers/staging/unisys/virthba/virthba.c
index d7a629b..686aa92 100644
--- a/drivers/staging/unisys/virthba/virthba.c
+++ b/drivers/staging/unisys/virthba/virthba.c
@@ -260,7 +260,7 @@ add_scsipending_entry(struct virthba_info *vhbainfo, char
cmdtype, void *new)
insert_location = vhbainfo-nextinsert;
while (vhbainfo-pending[insert_location].sent != NULL) {
insert_location = (insert_location + 1) % MAX_PENDING_REQUESTS;
- if (insert_location == (int) vhbainfo-nextinsert) {
+ if (insert_location == (int)vhbainfo-nextinsert) {
LOGERR(Queue should be full. insert_location%d
Unable to find open slot for pending commands.\n,
insert_location);
spin_unlock_irqrestore(vhbainfo-privlock, flags);
@@ -289,7 +289,7 @@ add_scsipending_entry_with_wait(struct virthba_info
*vhbainfo, char cmdtype,
insert_location = add_scsipending_entry(vhbainfo, cmdtype, new);
}
- return (unsigned int) insert_location;
+ return (unsigned int)insert_location;
}
static void *
@@ -300,13 +300,13 @@ del_scsipending_entry(struct virthba_info *vhbainfo,
uintptr_t del)
if (del = MAX_PENDING_REQUESTS) {
LOGERR(Invalid queue position %lu given to delete.
MAX_PENDING_REQUESTS %d\n,
-(unsigned long) del, MAX_PENDING_REQUESTS);
+(unsigned long)del, MAX_PENDING_REQUESTS);
} else {
spin_lock_irqsave(vhbainfo-privlock, flags);
if (vhbainfo-pending[del].sent == NULL)
LOGERR(Deleting already cleared queue entry at
%lu.\n,
-(unsigned long) del);
+(unsigned long)del);
sent = vhbainfo-pending[del].sent;
@@ -418,7 +418,7 @@ process_disk_notify(struct Scsi_Host *shost, struct
uiscmdrsp *cmdrsp)
static irqreturn_t
virthba_ISR(int irq, void *dev_id)
{
- struct virthba_info *virthbainfo = (struct virthba_info *) dev_id;
+ struct virthba_info *virthbainfo = (struct virthba_info *)dev_id;
struct channel_header __iomem *pChannelHeader;
struct signal_queue_header __iomem *pqhdr;
u64 mask;
@@ -442,7 +442,7 @@ virthba_ISR(int irq, void *dev_id)
return IRQ_NONE;
}
pqhdr = (struct signal_queue_header __iomem *)
- ((char __iomem *) pChannelHeader +
+ ((char __iomem *)pChannelHeader +
readq(pChannelHeader-ch_space_offset)) + IOCHAN_FROM_IOPART;
writeq(readq(pqhdr-num_irq_received) + 1,
pqhdr-num_irq_received);
@@ -501,19 +501,19 @@ virthba_probe(struct virtpci_dev *virtpcidev, const
struct pci_device_id *id)
* the max-channel value.
*/
LOGINF(virtpcidev-scsi.max.max_channel=%u, max_id=%u, max_lun=%u,
cmd_per_lun=%u, max_io_size=%u\n,
-(unsigned) virtpcidev-scsi.max.max_channel - 1,
-(unsigned) virtpcidev-scsi.max.max_id,
-(unsigned) virtpcidev-scsi.max.max_lun,
-(unsigned) virtpcidev-scsi.max.cmd_per_lun,
-(unsigned) virtpcidev-scsi.max.max_io_size);
- scsihost-max_channel = (unsigned) virtpcidev-scsi.max.max_channel;
- scsihost-max_id = (unsigned) virtpcidev-scsi.max.max_id;
- scsihost-max_lun = (unsigned) virtpcidev-scsi.max.max_lun;
- scsihost-cmd_per_lun = (unsigned) virtpcidev-scsi.max.cmd_per_lun;
+(unsigned)virtpcidev-scsi.max.max_channel - 1,
+(unsigned)virtpcidev-scsi.max.max_id,
+(unsigned)virtpcidev-scsi.max.max_lun,
+(unsigned)virtpcidev-scsi.max.cmd_per_lun,
+(unsigned)virtpcidev-scsi.max.max_io_size);
+ scsihost-max_channel = (unsigned)virtpcidev-scsi.max.max_channel;
+ scsihost-max_id = (unsigned)virtpcidev-scsi.max.max_id;
+ scsihost-max_lun = (unsigned)virtpcidev-scsi.max.max_lun;
+ scsihost-cmd_per_lun = (unsigned)virtpcidev-scsi.max.cmd_per_lun;
scsihost-max_sectors =
- (unsigned short) (virtpcidev-scsi.max.max_io_size 9);
+ (unsigned short)(virtpcidev-scsi.max.max_io_size 9);
scsihost-sg_tablesize =
- (unsigned short) (virtpcidev-scsi.max.max_io_size / PAGE_SIZE);
+ (unsigned short)(virtpcidev
[PATCH] staging: unisys: Fix CamelCase params in SignalInsert_withLock
From: Ken Depro kenneth.de...@unisys.com
This patch renames the following SignalInsert_withLock parameters
to fix the CamelCase checks:
pChannel to pchannel
Queue to queue
pSignal to psignal
Signed-off-by: Ken Depro kenneth.de...@unisys.com
---
drivers/staging/unisys/channels/chanstub.c |6 +++---
drivers/staging/unisys/channels/chanstub.h |4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/unisys/channels/chanstub.c
b/drivers/staging/unisys/channels/chanstub.c
index b6fd126..516bd87 100644
--- a/drivers/staging/unisys/channels/chanstub.c
+++ b/drivers/staging/unisys/channels/chanstub.c
@@ -42,14 +42,14 @@ channel_mod_exit(void)
}
unsigned char
-SignalInsert_withLock(struct channel_header __iomem *pChannel, u32 Queue,
- void *pSignal, spinlock_t *lock)
+SignalInsert_withLock(struct channel_header __iomem *pchannel, u32 queue,
+ void *psignal, spinlock_t *lock)
{
unsigned char result;
unsigned long flags;
spin_lock_irqsave(lock, flags);
- result = spar_signal_insert(pChannel, Queue, pSignal);
+ result = spar_signal_insert(pchannel, queue, psignal);
spin_unlock_irqrestore(lock, flags);
return result;
}
diff --git a/drivers/staging/unisys/channels/chanstub.h
b/drivers/staging/unisys/channels/chanstub.h
index 1531759..ea65a84 100644
--- a/drivers/staging/unisys/channels/chanstub.h
+++ b/drivers/staging/unisys/channels/chanstub.h
@@ -15,8 +15,8 @@
#ifndef __CHANSTUB_H__
#define __CHANSTUB_H__
-unsigned char SignalInsert_withLock(struct channel_header __iomem *pChannel,
- u32 Queue, void *pSignal, spinlock_t *lock);
+unsigned char SignalInsert_withLock(struct channel_header __iomem *pchannel,
+ u32 queue, void *psignal, spinlock_t *lock);
unsigned char SignalRemove_withLock(struct channel_header __iomem *pChannel,
u32 Queue, void *pSignal, spinlock_t *lock);
--
1.7.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: unisys: Remove extra blank lines from virthba files
From: Ken Depro kenneth.de...@unisys.com This patch removes extra blank lines from the virthba header and source files. This is the first of a set of patches that will clean up the virthba source file. The only checkpatch issue in the header file was the blank line warnings. Signed-off-by: Ken Depro kenneth.de...@unisys.com Signed-off-by: Ben Romer benjamin.ro...@unisys.com --- drivers/staging/unisys/virthba/virthba.c |2 -- drivers/staging/unisys/virthba/virthba.h |4 2 files changed, 0 insertions(+), 6 deletions(-) diff --git a/drivers/staging/unisys/virthba/virthba.c b/drivers/staging/unisys/virthba/virthba.c index ee1be5a..ea933b2 100644 --- a/drivers/staging/unisys/virthba/virthba.c +++ b/drivers/staging/unisys/virthba/virthba.c @@ -101,7 +101,6 @@ static DEF_SCSI_QCMD(virthba_queue_command) #define virthba_queue_command virthba_queue_command_lck #endif - static int virthba_slave_alloc(struct scsi_device *scsidev); static int virthba_slave_configure(struct scsi_device *scsidev); static void virthba_slave_destroy(struct scsi_device *scsidev); @@ -1323,7 +1322,6 @@ drain_queue(struct virthba_info *virthbainfo, struct chaninfo *dc, } } - /* main function for the thread that waits for scsi commands to arrive * in a specified queue */ diff --git a/drivers/staging/unisys/virthba/virthba.h b/drivers/staging/unisys/virthba/virthba.h index d4b809b..5990166 100644 --- a/drivers/staging/unisys/virthba/virthba.h +++ b/drivers/staging/unisys/virthba/virthba.h @@ -19,13 +19,9 @@ * Unisys Virtual HBA driver header */ - - #ifndef __VIRTHBA_H__ #define __VIRTHBA_H__ - #define VIRTHBA_VERSION 01.00 - #endif /* __VIRTHBA_H__ */ -- 1.7.1 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: unisys: Remove unnecessary spaces after casts in virthba.c
From: Ken Depro kenneth.de...@unisys.com
This patch removes unneeded spaces after casts within the virthba.c
file. The checkpatch script was run after these changes, and no
remove spaces after casts checks were generated.
Later patches will fix the other checkpatch warnings/checks.
Signed-off-by: Ken Depro kenneth.de...@unisys.com
---
drivers/staging/unisys/virthba/virthba.c | 130 +++---
1 files changed, 65 insertions(+), 65 deletions(-)
diff --git a/drivers/staging/unisys/virthba/virthba.c
b/drivers/staging/unisys/virthba/virthba.c
index ee1be5a..d435734 100644
--- a/drivers/staging/unisys/virthba/virthba.c
+++ b/drivers/staging/unisys/virthba/virthba.c
@@ -261,7 +261,7 @@ add_scsipending_entry(struct virthba_info *vhbainfo, char
cmdtype, void *new)
insert_location = vhbainfo-nextinsert;
while (vhbainfo-pending[insert_location].sent != NULL) {
insert_location = (insert_location + 1) % MAX_PENDING_REQUESTS;
- if (insert_location == (int) vhbainfo-nextinsert) {
+ if (insert_location == (int)vhbainfo-nextinsert) {
LOGERR(Queue should be full. insert_location%d
Unable to find open slot for pending commands.\n,
insert_location);
spin_unlock_irqrestore(vhbainfo-privlock, flags);
@@ -290,7 +290,7 @@ add_scsipending_entry_with_wait(struct virthba_info
*vhbainfo, char cmdtype,
insert_location = add_scsipending_entry(vhbainfo, cmdtype, new);
}
- return (unsigned int) insert_location;
+ return (unsigned int)insert_location;
}
static void *
@@ -301,13 +301,13 @@ del_scsipending_entry(struct virthba_info *vhbainfo,
uintptr_t del)
if (del = MAX_PENDING_REQUESTS) {
LOGERR(Invalid queue position %lu given to delete.
MAX_PENDING_REQUESTS %d\n,
-(unsigned long) del, MAX_PENDING_REQUESTS);
+(unsigned long)del, MAX_PENDING_REQUESTS);
} else {
spin_lock_irqsave(vhbainfo-privlock, flags);
if (vhbainfo-pending[del].sent == NULL)
LOGERR(Deleting already cleared queue entry at
%lu.\n,
-(unsigned long) del);
+(unsigned long)del);
sent = vhbainfo-pending[del].sent;
@@ -419,7 +419,7 @@ process_disk_notify(struct Scsi_Host *shost, struct
uiscmdrsp *cmdrsp)
static irqreturn_t
virthba_ISR(int irq, void *dev_id)
{
- struct virthba_info *virthbainfo = (struct virthba_info *) dev_id;
+ struct virthba_info *virthbainfo = (struct virthba_info *)dev_id;
struct channel_header __iomem *pChannelHeader;
struct signal_queue_header __iomem *pqhdr;
u64 mask;
@@ -443,7 +443,7 @@ virthba_ISR(int irq, void *dev_id)
return IRQ_NONE;
}
pqhdr = (struct signal_queue_header __iomem *)
- ((char __iomem *) pChannelHeader +
+ ((char __iomem *)pChannelHeader +
readq(pChannelHeader-ch_space_offset)) + IOCHAN_FROM_IOPART;
writeq(readq(pqhdr-num_irq_received) + 1,
pqhdr-num_irq_received);
@@ -502,19 +502,19 @@ virthba_probe(struct virtpci_dev *virtpcidev, const
struct pci_device_id *id)
* the max-channel value.
*/
LOGINF(virtpcidev-scsi.max.max_channel=%u, max_id=%u, max_lun=%u,
cmd_per_lun=%u, max_io_size=%u\n,
-(unsigned) virtpcidev-scsi.max.max_channel - 1,
-(unsigned) virtpcidev-scsi.max.max_id,
-(unsigned) virtpcidev-scsi.max.max_lun,
-(unsigned) virtpcidev-scsi.max.cmd_per_lun,
-(unsigned) virtpcidev-scsi.max.max_io_size);
- scsihost-max_channel = (unsigned) virtpcidev-scsi.max.max_channel;
- scsihost-max_id = (unsigned) virtpcidev-scsi.max.max_id;
- scsihost-max_lun = (unsigned) virtpcidev-scsi.max.max_lun;
- scsihost-cmd_per_lun = (unsigned) virtpcidev-scsi.max.cmd_per_lun;
+(unsigned)virtpcidev-scsi.max.max_channel - 1,
+(unsigned)virtpcidev-scsi.max.max_id,
+(unsigned)virtpcidev-scsi.max.max_lun,
+(unsigned)virtpcidev-scsi.max.cmd_per_lun,
+(unsigned)virtpcidev-scsi.max.max_io_size);
+ scsihost-max_channel = (unsigned)virtpcidev-scsi.max.max_channel;
+ scsihost-max_id = (unsigned)virtpcidev-scsi.max.max_id;
+ scsihost-max_lun = (unsigned)virtpcidev-scsi.max.max_lun;
+ scsihost-cmd_per_lun = (unsigned)virtpcidev-scsi.max.cmd_per_lun;
scsihost-max_sectors =
- (unsigned short) (virtpcidev-scsi.max.max_io_size 9);
+ (unsigned short)(virtpcidev-scsi.max.max_io_size 9);
scsihost-sg_tablesize =
- (unsigned short) (virtpcidev-scsi.max.max_io_size / PAGE_SIZE);
+ (unsigned short)(virtpcidev-scsi.max.max_io_size / PAGE_SIZE);
if (scsihost
[PATCH] staging: unisys: Remove unneeded spaces from channel.c
From: Ken Depro kenneth.de...@unisys.com
This patch removes some unneeded white space after casts within the
channel.c file. The checkpatch script was run after these changes,
and no further checks or warnings were seen.
Signed-off-by: Ken Depro kenneth.de...@unisys.com
Signed-off-by: Ben Romer benjamin.ro...@unisys.com
---
drivers/staging/unisys/channels/channel.c | 14 +++---
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/unisys/channels/channel.c
b/drivers/staging/unisys/channels/channel.c
index 2fc61a7..74cc4d6 100644
--- a/drivers/staging/unisys/channels/channel.c
+++ b/drivers/staging/unisys/channels/channel.c
@@ -51,7 +51,7 @@ unsigned char spar_signal_insert(struct channel_header
__iomem *ch, u32 queue,
struct signal_queue_header __iomem *pqhdr =
(struct signal_queue_header __iomem *)
- ((char __iomem *) ch + readq(ch-ch_space_offset))
+ ((char __iomem *)ch + readq(ch-ch_space_offset))
+ queue;
/* capture current head and tail */
@@ -107,7 +107,7 @@ spar_signal_remove(struct channel_header __iomem *ch, u32
queue, void *sig)
void __iomem *psource;
unsigned int head, tail;
struct signal_queue_header __iomem *pqhdr =
- (struct signal_queue_header __iomem *) ((char __iomem *) ch +
+ (struct signal_queue_header __iomem *)((char __iomem *)ch +
readq(ch-ch_space_offset)) + queue;
/* capture current head and tail */
@@ -124,7 +124,7 @@ spar_signal_remove(struct channel_header __iomem *ch, u32
queue, void *sig)
tail = (tail + 1) % readl(pqhdr-max_slots);
/* copy signal from tail location to the area pointed to by pSignal */
- psource = (char __iomem *) pqhdr + readq(pqhdr-sig_base_offset) +
+ psource = (char __iomem *)pqhdr + readq(pqhdr-sig_base_offset) +
(tail * readl(pqhdr-signal_size));
memcpy_fromio(sig, psource, readl(pqhdr-signal_size));
@@ -162,7 +162,7 @@ unsigned int spar_signal_remove_all(struct channel_header
*ch, u32 queue,
void *psource;
unsigned int head, tail, count = 0;
struct signal_queue_header *pqhdr =
- (struct signal_queue_header *) ((char *) ch +
+ (struct signal_queue_header *)((char *)ch +
ch-ch_space_offset) + queue;
/* capture current head and tail */
@@ -181,9 +181,9 @@ unsigned int spar_signal_remove_all(struct channel_header
*ch, u32 queue,
* to by pSignal
*/
psource =
- (char *) pqhdr + pqhdr-sig_base_offset +
+ (char *)pqhdr + pqhdr-sig_base_offset +
(tail * pqhdr-signal_size);
- memcpy((char *) sig + (pqhdr-signal_size * count),
+ memcpy((char *)sig + (pqhdr-signal_size * count),
psource, pqhdr-signal_size);
mb(); /* channel synch */
@@ -211,7 +211,7 @@ unsigned char spar_signalqueue_empty(struct channel_header
__iomem *ch,
u32 queue)
{
struct signal_queue_header __iomem *pqhdr =
- (struct signal_queue_header __iomem *) ((char __iomem *) ch +
+ (struct signal_queue_header __iomem *)((char __iomem *)ch +
readq(ch-ch_space_offset)) + queue;
return readl(pqhdr-head) == readl(pqhdr-tail);
}
--
1.7.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
