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) {
- LOGERR("Start sg_list dump (entries %d, bufflen
%d)...\n",
+ LOGERR("Start sg_list dump(entries %d, bufflen %d)..\n",
scsi_sg_count(scsicmd), cmdrsp->scsi.bufflen);
for_each_sg(sgl, sg, scsi_sg_count(scsicmd), i) {
LOGERR(" Entry(%d): page->[0x%p],
phys->[0x%Lx], off(%d), len(%d)\n",
@@ -1186,7 +1188,7 @@ do_scsi_nolinuxstat(struct uiscmdrsp *cmdrsp, struct
scsi_cmnd *scsicmd)
if (scsi_sg_count(scsicmd) == 0) {
if (scsi_bufflen(scsicmd) > 0) {
- LOGERR("**** FAILED No scatter list for bufflen
> 0\n");
+ LOGERR("Err: No scatter list for buflen > 0\n");
BUG_ON(scsi_sg_count(scsicmd) ==
0);
}
@@ -1217,7 +1219,7 @@ do_scsi_nolinuxstat(struct uiscmdrsp *cmdrsp, struct
scsi_cmnd *scsicmd)
if (atomic_read(&vdisk->ios_threshold) > 0) {
atomic_dec(&vdisk->ios_threshold);
if (atomic_read(&vdisk->ios_threshold) == 0) {
- LOGERR("Resetting error count for
disk\n");
+ LOGERR("Resetting err cnt for disk\n");
atomic_set(&vdisk->error_count, 0);
}
}
@@ -1339,7 +1341,7 @@ process_incoming_rsps(void *v)
/* alloc once and reuse */
cmdrsp = kmalloc(SZ, GFP_ATOMIC);
if (cmdrsp == NULL) {
- LOGERR("process_incoming_rsps ****FAILED to malloc - thread
exiting\n");
+ LOGERR("process_incoming_rsps; FAILED malloc-thread exiting\n");
complete_and_exit(&dc->threadinfo.has_stopped, 0);
return 0;
}
@@ -1389,7 +1391,8 @@ static ssize_t info_debugfs_read(struct file *file,
virthbainfo = virthbas_open[i].virthbainfo;
str_pos += scnprintf(vbuf + str_pos,
- len - str_pos, "max_buff_len:%u\n",
max_buff_len);
+ len - str_pos, "max_buff_len:%u\n",
+ max_buff_len);
str_pos += scnprintf(vbuf + str_pos, len - str_pos,
"\nvirthba result queue poll wait:%d usecs.\n",
@@ -1419,7 +1422,8 @@ static ssize_t info_debugfs_read(struct file *file,
}
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)
{
char buf[4];
int i, new_value;
@@ -1484,7 +1488,7 @@ virthba_serverup(struct virtpci_dev *virtpcidev)
virtpcidev->device_no);
if (!virthbainfo->serverdown) {
- DBGINF("Server up message received while server is already
up.\n");
+ DBGINF("Server up msg received while server is already up.\n");
return 1;
}
if (virthbainfo->serverchangingstate) {
@@ -1602,7 +1606,7 @@ virthba_serverdown(struct virtpci_dev *virtpcidev, u32
state)
LOGERR("Server already processing change state message\n");
stat = 0;
} else {
- LOGERR("Server already down, but another server down message
received.");
+ LOGERR("Server already down, but new server down msg rcvd.");
}
return stat;
@@ -1678,7 +1682,7 @@ virthba_mod_init(void)
virthba_serverdown_workqueue =
create_singlethread_workqueue("virthba_serverdown");
if (virthba_serverdown_workqueue == NULL) {
- LOGERR("**** FAILED virthba_serverdown_workqueue
creation\n");
+ LOGERR("FAILED virthba_serverdown_workqueue create\n");
POSTCODE_LINUX_2(VHBA_CREATE_FAILURE_PC,
POSTCODE_SEVERITY_ERR);
error = -1;
--
1.7.9.5
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
