From: Don Brace <don.brace@pmcs.com>
To: scott.teel@pmcs.com, Kevin.Barnett@pmcs.com,
scott.benesh@pmcs.com, james.bottomley@parallels.com,
hch@infradead.org, Justin.Lindley@pmcs.com, elliott@hpe.com
Cc: linux-scsi@vger.kernel.org
Subject: [PATCH v2 01/27] hpsa: remove unused parameter hostno
Date: Wed, 04 Nov 2015 15:50:01 -0600 [thread overview]
Message-ID: <20151104215001.15472.10879.stgit@brunhilda> (raw)
In-Reply-To: <20151104214910.15472.23179.stgit@brunhilda>
This parameter was once used before scan_start was defined
but now it is no longer used.
Signed-off-by: Don Brace <don.brace@pmcs.com>
---
drivers/scsi/hpsa.c | 30 ++++++++++++++----------------
1 file changed, 14 insertions(+), 16 deletions(-)
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 40669f8..815dc7f 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -243,7 +243,7 @@ static int hpsa_slave_alloc(struct scsi_device *sdev);
static int hpsa_slave_configure(struct scsi_device *sdev);
static void hpsa_slave_destroy(struct scsi_device *sdev);
-static void hpsa_update_scsi_devices(struct ctlr_info *h, int hostno);
+static void hpsa_update_scsi_devices(struct ctlr_info *h);
static int check_for_unit_attention(struct ctlr_info *h,
struct CommandList *c);
static void check_ioctl_unit_attention(struct ctlr_info *h,
@@ -1152,7 +1152,7 @@ static inline void hpsa_show_dev_msg(const char *level, struct ctlr_info *h,
}
/* Add an entry into h->dev[] array. */
-static int hpsa_scsi_add_entry(struct ctlr_info *h, int hostno,
+static int hpsa_scsi_add_entry(struct ctlr_info *h,
struct hpsa_scsi_dev_t *device,
struct hpsa_scsi_dev_t *added[], int *nadded)
{
@@ -1228,7 +1228,7 @@ lun_assigned:
}
/* Update an entry in h->dev[] array. */
-static void hpsa_scsi_update_entry(struct ctlr_info *h, int hostno,
+static void hpsa_scsi_update_entry(struct ctlr_info *h,
int entry, struct hpsa_scsi_dev_t *new_entry)
{
int offload_enabled;
@@ -1276,7 +1276,7 @@ static void hpsa_scsi_update_entry(struct ctlr_info *h, int hostno,
}
/* Replace an entry from h->dev[] array. */
-static void hpsa_scsi_replace_entry(struct ctlr_info *h, int hostno,
+static void hpsa_scsi_replace_entry(struct ctlr_info *h,
int entry, struct hpsa_scsi_dev_t *new_entry,
struct hpsa_scsi_dev_t *added[], int *nadded,
struct hpsa_scsi_dev_t *removed[], int *nremoved)
@@ -1304,7 +1304,7 @@ static void hpsa_scsi_replace_entry(struct ctlr_info *h, int hostno,
}
/* Remove an entry from h->dev[] array. */
-static void hpsa_scsi_remove_entry(struct ctlr_info *h, int hostno, int entry,
+static void hpsa_scsi_remove_entry(struct ctlr_info *h, int entry,
struct hpsa_scsi_dev_t *removed[], int *nremoved)
{
/* assumes h->devlock is held */
@@ -1638,7 +1638,7 @@ static void hpsa_update_log_drive_phys_drive_ptrs(struct ctlr_info *h,
}
}
-static void adjust_hpsa_scsi_table(struct ctlr_info *h, int hostno,
+static void adjust_hpsa_scsi_table(struct ctlr_info *h,
struct hpsa_scsi_dev_t *sd[], int nsds)
{
/* sd contains scsi3 addresses and devtypes, and inquiry
@@ -1678,19 +1678,18 @@ static void adjust_hpsa_scsi_table(struct ctlr_info *h, int hostno,
device_change = hpsa_scsi_find_entry(csd, sd, nsds, &entry);
if (device_change == DEVICE_NOT_FOUND) {
changes++;
- hpsa_scsi_remove_entry(h, hostno, i,
- removed, &nremoved);
+ hpsa_scsi_remove_entry(h, i, removed, &nremoved);
continue; /* remove ^^^, hence i not incremented */
} else if (device_change == DEVICE_CHANGED) {
changes++;
- hpsa_scsi_replace_entry(h, hostno, i, sd[entry],
+ hpsa_scsi_replace_entry(h, i, sd[entry],
added, &nadded, removed, &nremoved);
/* Set it to NULL to prevent it from being freed
* at the bottom of hpsa_update_scsi_devices()
*/
sd[entry] = NULL;
} else if (device_change == DEVICE_UPDATED) {
- hpsa_scsi_update_entry(h, hostno, i, sd[entry]);
+ hpsa_scsi_update_entry(h, i, sd[entry]);
}
i++;
}
@@ -1718,8 +1717,7 @@ static void adjust_hpsa_scsi_table(struct ctlr_info *h, int hostno,
h->ndevices, &entry);
if (device_change == DEVICE_NOT_FOUND) {
changes++;
- if (hpsa_scsi_add_entry(h, hostno, sd[i],
- added, &nadded) != 0)
+ if (hpsa_scsi_add_entry(h, sd[i], added, &nadded) != 0)
break;
sd[i] = NULL; /* prevent from being freed later. */
} else if (device_change == DEVICE_CHANGED) {
@@ -1755,7 +1753,7 @@ static void adjust_hpsa_scsi_table(struct ctlr_info *h, int hostno,
* (or if there are no changes) scsi_scan_host will do it later the
* first time through.
*/
- if (hostno == -1 || !changes)
+ if (!changes)
goto free_and_out;
sh = h->scsi_host;
@@ -3702,7 +3700,7 @@ static void hpsa_get_path_info(struct hpsa_scsi_dev_t *this_device,
sizeof(this_device->bay));
}
-static void hpsa_update_scsi_devices(struct ctlr_info *h, int hostno)
+static void hpsa_update_scsi_devices(struct ctlr_info *h)
{
/* the idea here is we could get notified
* that some devices have changed, so we do a report
@@ -3865,7 +3863,7 @@ static void hpsa_update_scsi_devices(struct ctlr_info *h, int hostno)
if (ncurrent >= HPSA_MAX_DEVICES)
break;
}
- adjust_hpsa_scsi_table(h, hostno, currentsd, ncurrent);
+ adjust_hpsa_scsi_table(h, currentsd, ncurrent);
out:
kfree(tmpdevice);
for (i = 0; i < ndev_allocated; i++)
@@ -4947,7 +4945,7 @@ static void hpsa_scan_start(struct Scsi_Host *sh)
if (unlikely(lockup_detected(h)))
return hpsa_scan_complete(h);
- hpsa_update_scsi_devices(h, h->scsi_host->host_no);
+ hpsa_update_scsi_devices(h);
hpsa_scan_complete(h);
}
next prev parent reply other threads:[~2015-11-04 21:53 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-04 21:49 [PATCH v2 00/27] hpsa updates Don Brace
2015-11-04 21:50 ` Don Brace [this message]
2015-11-06 14:22 ` [PATCH v2 01/27] hpsa: remove unused parameter hostno Tomas Henzl
2015-11-04 21:50 ` [PATCH v2 02/27] hpsa: stop zeroing reset_cmds_out and ioaccel_cmds_out during rescan Don Brace
2015-11-04 21:50 ` [PATCH v2 03/27] hpsa: remove unused hpsa_tag_discard_error_bits Don Brace
2015-11-05 15:30 ` Manoj Kumar
2015-11-04 21:50 ` [PATCH v2 04/27] hpsa: change devtype to unsigned Don Brace
2015-11-04 21:50 ` [PATCH v2 05/27] hpsa: check for null arguments to dev_printk Don Brace
2015-11-09 9:37 ` Hannes Reinecke
2015-11-04 21:50 ` [PATCH v2 06/27] hpsa: fix null device issues Don Brace
2015-11-09 9:38 ` Hannes Reinecke
2015-11-04 21:50 ` [PATCH v2 07/27] hpsa: allow driver requested rescans Don Brace
2015-11-04 21:50 ` [PATCH v2 08/27] hpsa: abandon rescans on memory alloaction failures Don Brace
2015-11-09 9:38 ` Hannes Reinecke
2015-11-04 21:50 ` [PATCH v2 09/27] hpsa: correct transfer length for 6 byte read/write commands Don Brace
2015-11-04 21:50 ` [PATCH v2 10/27] hpsa: fix hpsa_adjust_hpsa_scsi_table Don Brace
2015-11-09 9:39 ` Hannes Reinecke
2015-11-04 21:51 ` [PATCH v2 11/27] hpsa: fix physical target reset Don Brace
2015-11-04 21:51 ` [PATCH v2 12/27] hpsa: correct check for non-disk devices Don Brace
2015-11-04 21:51 ` [PATCH v2 13/27] hpsa: correct ioaccel2 sg chain len Don Brace
2015-11-04 21:51 ` [PATCH v2 14/27] hpsa: simplify check for device exposure Don Brace
2015-11-04 21:51 ` [PATCH v2 15/27] hpsa: simplify update scsi devices Don Brace
2015-11-04 21:51 ` [PATCH v2 16/27] hpsa: add function is_logical_device Don Brace
2015-11-04 21:51 ` [PATCH v2 17/27] hpsa: enhance hpsa_get_device_id Don Brace
2015-11-09 9:40 ` Hannes Reinecke
2015-11-04 21:51 ` [PATCH v2 18/27] hpsa: refactor hpsa_figure_bus_target_lun Don Brace
2015-11-05 16:18 ` Matthew R. Ochs
2015-11-04 21:51 ` [PATCH v2 19/27] hpsa: move scsi_add_device and scsi_remove_device calls to new function Don Brace
2015-11-04 21:51 ` [PATCH v2 20/27] hpsa: generalize external arrays Don Brace
2015-11-05 16:23 ` Matthew R. Ochs
2015-11-05 19:51 ` Don Brace
2015-11-04 21:52 ` [PATCH v2 21/27] hpsa: eliminate fake lun0 enclosures Don Brace
2015-11-04 21:52 ` [PATCH v2 22/27] hpsa: add discovery polling for PT RAID devices Don Brace
2015-11-04 21:52 ` [PATCH v2 23/27] hpsa: disable report lun data caching Don Brace
2015-11-04 21:52 ` [PATCH v2 24/27] hpsa: enhance device messages Don Brace
2015-11-04 21:52 ` [PATCH v2 25/27] hpsa: fix multiple issues in path_info_show Don Brace
2015-11-04 21:52 ` [PATCH v2 26/27] hpsa: add in sas transport class Don Brace
2015-11-04 21:52 ` [PATCH v2 27/27] hpsa: bump the driver version Don Brace
2015-11-06 14:30 ` [PATCH v2 00/27] hpsa updates Tomas Henzl
2015-11-06 15:05 ` Don Brace
2015-11-09 17:46 ` Martin K. Petersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151104215001.15472.10879.stgit@brunhilda \
--to=don.brace@pmcs.com \
--cc=Justin.Lindley@pmcs.com \
--cc=Kevin.Barnett@pmcs.com \
--cc=elliott@hpe.com \
--cc=hch@infradead.org \
--cc=james.bottomley@parallels.com \
--cc=linux-scsi@vger.kernel.org \
--cc=scott.benesh@pmcs.com \
--cc=scott.teel@pmcs.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox