From 273af28723c9837914a09477aa6a043e9bf72ee1 Mon Sep 17 00:00:00 2001 From: Satish Kharat Date: Tue, 7 Mar 2017 10:26:18 -0800 Subject: [PATCH] fnic: minor white space changes Orabug: 25638880 Signed-off-by: Satish Kharat Signed-off-by: Somasundaram Krishnasamy Reviewed-by: Brian Maly --- drivers/scsi/fnic/fnic_debugfs.c | 6 ++++-- drivers/scsi/fnic/fnic_scsi.c | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/drivers/scsi/fnic/fnic_debugfs.c b/drivers/scsi/fnic/fnic_debugfs.c index 5980c10c734d..1f21da7cb3b5 100644 --- a/drivers/scsi/fnic/fnic_debugfs.c +++ b/drivers/scsi/fnic/fnic_debugfs.c @@ -251,13 +251,13 @@ static int fnic_trace_debugfs_open(struct inode *inode, if (*rdata_ptr == fc_trc_flag->fnic_trace) { fnic_dbg_prt->buffer = vmalloc(3 * - (trace_max_pages * PAGE_SIZE)); + (trace_max_pages * PAGE_SIZE)); if (!fnic_dbg_prt->buffer) { kfree(fnic_dbg_prt); return -ENOMEM; } memset((void *)fnic_dbg_prt->buffer, 0, - 3 * (trace_max_pages * PAGE_SIZE)); + 3 * (trace_max_pages * PAGE_SIZE)); fnic_dbg_prt->buffer_len = fnic_get_trace_data(fnic_dbg_prt); } else { fnic_dbg_prt->buffer = @@ -403,6 +403,8 @@ int fnic_trace_debugfs_init(void) "Cannot create trace file under debugfs\n"); return rc; } + + rc = 0; return rc; } diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c index 559a46e70aef..afe3bcd6db07 100644 --- a/drivers/scsi/fnic/fnic_scsi.c +++ b/drivers/scsi/fnic/fnic_scsi.c @@ -230,10 +230,10 @@ int fnic_fw_reset_handler(struct fnic *fnic) fnic_queue_wq_copy_desc_fw_reset(wq, SCSI_NO_TAG); atomic64_inc(&fnic->fnic_stats.fw_stats.active_fw_reqs); if (atomic64_read(&fnic->fnic_stats.fw_stats.active_fw_reqs) > - atomic64_read(&fnic->fnic_stats.fw_stats.max_fw_reqs)) + atomic64_read(&fnic->fnic_stats.fw_stats.max_fw_reqs)) atomic64_set(&fnic->fnic_stats.fw_stats.max_fw_reqs, - atomic64_read( - &fnic->fnic_stats.fw_stats.active_fw_reqs)); + atomic64_read( + &fnic->fnic_stats.fw_stats.active_fw_reqs)); } spin_unlock_irqrestore(&fnic->wq_copy_lock[0], flags); @@ -301,9 +301,9 @@ int fnic_flogi_reg_handler(struct fnic *fnic, u32 fc_id) atomic64_inc(&fnic->fnic_stats.fw_stats.active_fw_reqs); if (atomic64_read(&fnic->fnic_stats.fw_stats.active_fw_reqs) > - atomic64_read(&fnic->fnic_stats.fw_stats.max_fw_reqs)) + atomic64_read(&fnic->fnic_stats.fw_stats.max_fw_reqs)) atomic64_set(&fnic->fnic_stats.fw_stats.max_fw_reqs, - atomic64_read(&fnic->fnic_stats.fw_stats.active_fw_reqs)); + atomic64_read(&fnic->fnic_stats.fw_stats.active_fw_reqs)); flogi_reg_ioreq_end: spin_unlock_irqrestore(&fnic->wq_copy_lock[0], flags); @@ -397,9 +397,9 @@ static inline int fnic_queue_wq_copy_desc(struct fnic *fnic, atomic64_inc(&fnic->fnic_stats.fw_stats.active_fw_reqs); if (atomic64_read(&fnic->fnic_stats.fw_stats.active_fw_reqs) > - atomic64_read(&fnic->fnic_stats.fw_stats.max_fw_reqs)) + atomic64_read(&fnic->fnic_stats.fw_stats.max_fw_reqs)) atomic64_set(&fnic->fnic_stats.fw_stats.max_fw_reqs, - atomic64_read(&fnic->fnic_stats.fw_stats.active_fw_reqs)); + atomic64_read(&fnic->fnic_stats.fw_stats.active_fw_reqs)); spin_unlock_irqrestore(&fnic->wq_copy_lock[0], intr_flags); return 0; @@ -556,7 +556,7 @@ static int fnic_queuecommand_lck(struct scsi_cmnd *sc, void (*done)(struct scsi_ atomic64_inc(&fnic_stats->io_stats.active_ios); atomic64_inc(&fnic_stats->io_stats.num_ios); if (atomic64_read(&fnic_stats->io_stats.active_ios) > - atomic64_read(&fnic_stats->io_stats.max_active_ios)) + atomic64_read(&fnic_stats->io_stats.max_active_ios)) atomic64_set(&fnic_stats->io_stats.max_active_ios, atomic64_read(&fnic_stats->io_stats.active_ios)); @@ -1469,9 +1469,9 @@ static inline int fnic_queue_abort_io_req(struct fnic *fnic, int tag, atomic64_inc(&fnic->fnic_stats.fw_stats.active_fw_reqs); if (atomic64_read(&fnic->fnic_stats.fw_stats.active_fw_reqs) > - atomic64_read(&fnic->fnic_stats.fw_stats.max_fw_reqs)) + atomic64_read(&fnic->fnic_stats.fw_stats.max_fw_reqs)) atomic64_set(&fnic->fnic_stats.fw_stats.max_fw_reqs, - atomic64_read(&fnic->fnic_stats.fw_stats.active_fw_reqs)); + atomic64_read(&fnic->fnic_stats.fw_stats.active_fw_reqs)); spin_unlock_irqrestore(&fnic->wq_copy_lock[0], flags); atomic_dec(&fnic->in_flight); @@ -2008,9 +2008,9 @@ static inline int fnic_queue_dr_io_req(struct fnic *fnic, atomic64_inc(&fnic->fnic_stats.fw_stats.active_fw_reqs); if (atomic64_read(&fnic->fnic_stats.fw_stats.active_fw_reqs) > - atomic64_read(&fnic->fnic_stats.fw_stats.max_fw_reqs)) + atomic64_read(&fnic->fnic_stats.fw_stats.max_fw_reqs)) atomic64_set(&fnic->fnic_stats.fw_stats.max_fw_reqs, - atomic64_read(&fnic->fnic_stats.fw_stats.active_fw_reqs)); + atomic64_read(&fnic->fnic_stats.fw_stats.active_fw_reqs)); lr_io_req_end: spin_unlock_irqrestore(&fnic->wq_copy_lock[0], intr_flags); -- 2.50.1