From 1cdb67a6509783cda741a069ded519770dc4bb67 Mon Sep 17 00:00:00 2001 From: "Stephen M. Cameron" Date: Thu, 4 Feb 2010 08:41:49 -0600 Subject: [PATCH] --- yaml --- r: 181319 b: refs/heads/master c: 4967bd3e5caa87da43c251ae32504230259b18c6 h: refs/heads/master i: 181317: c49bb33e8aa0b618797b7943dddac11e5aa0e818 181315: 4d6a94b8ae96ede3c20f66ee8805c547e1429787 181311: bb53581a81d735ff507c5ef422391a83436b4221 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/hpsa.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bef4340f9921..afd6f8574256 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b2ed4f79194e06766327ae581b063f8747d94ea9 +refs/heads/master: 4967bd3e5caa87da43c251ae32504230259b18c6 diff --git a/trunk/drivers/scsi/hpsa.c b/trunk/drivers/scsi/hpsa.c index 2c256e31b107..6fe5142adc5e 100644 --- a/trunk/drivers/scsi/hpsa.c +++ b/trunk/drivers/scsi/hpsa.c @@ -733,7 +733,7 @@ static int hpsa_scsi_find_entry(struct hpsa_scsi_dev_t *needle, return DEVICE_NOT_FOUND; } -static int adjust_hpsa_scsi_table(struct ctlr_info *h, int hostno, +static void adjust_hpsa_scsi_table(struct ctlr_info *h, int hostno, struct hpsa_scsi_dev_t *sd[], int nsds) { /* sd contains scsi3 addresses and devtypes, and inquiry @@ -859,7 +859,6 @@ static int adjust_hpsa_scsi_table(struct ctlr_info *h, int hostno, free_and_out: kfree(added); kfree(removed); - return 0; } /*