Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannes Reinecke <hare@suse.de>2010-04-12 12:31:11 +0200
committerHannes Reinecke <hare@suse.de>2010-04-12 12:31:11 +0200
commit1c3aa9eacce8ae34b52cdc6bcc709ccc4aa1788d (patch)
tree28b54b1fc736c85d6ec82905257fa5302ab8829a
parent6e6fffea205418b468e5d6bef0d0aa42ec98ce14 (diff)
- patches.drivers/cnic-give-a-chance-for-the-uio-device-to-be-opened:
Fixup compilation warnings. - patches.drivers/qla2xxx-8.03.01.03.11.1-k8-update: Fixup compilation warnings. - patches.fixes/ipr-strstrip-retval-fix: Fixup compilation warnings in ipr. - patches.suse/dm-mpath-leastpending-select-path-fix: Compile warning in dm-least-pending. suse-commit: 865fa36c6176440c0d0bdb945700f0af472b6128
-rw-r--r--drivers/md/dm-least-pending.c5
-rw-r--r--drivers/net/cnic.c4
-rw-r--r--drivers/scsi/ipr.c10
-rw-r--r--drivers/scsi/qla2xxx/qla_isr.c1
4 files changed, 11 insertions, 9 deletions
diff --git a/drivers/md/dm-least-pending.c b/drivers/md/dm-least-pending.c
index 76659cab61d3..279bfdf65ef6 100644
--- a/drivers/md/dm-least-pending.c
+++ b/drivers/md/dm-least-pending.c
@@ -172,7 +172,7 @@ static int lpp_reinstate_path(struct path_selector *ps, struct dm_path *p)
}
static struct dm_path *lpp_select_path(struct path_selector *ps,
- unsigned *repeat_count)
+ unsigned *repeat_count, size_t nr_bytes)
{
struct selector *s = ps->context;
struct path_info *pi, *next, *least_io_path = NULL;
@@ -199,7 +199,8 @@ static struct dm_path *lpp_select_path(struct path_selector *ps,
return least_io_path->path;
}
-static int lpp_end_io(struct path_selector *ps, struct dm_path *path)
+static int lpp_end_io(struct path_selector *ps, struct dm_path *path,
+ size_t nr_bytes)
{
struct path_info *pi = NULL;
diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index 62658b849a25..d3307d820a69 100644
--- a/drivers/net/cnic.c
+++ b/drivers/net/cnic.c
@@ -281,8 +281,8 @@ static int cnic_send_nlmsg(struct cnic_local *cp, u32 type,
}
if (cp->uio_dev == -1) {
- printk(KERN_WARNING PFX, "%s: no uio dev to send nl request\n",
- cp->dev->netdev);
+ printk(KERN_WARNING PFX "%s: no uio dev to send nl request\n",
+ cp->dev->netdev->name);
return -ENODEV;
}
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 83a6b92fc8dc..6c9d5a7ca2c7 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -1330,12 +1330,13 @@ static void ipr_log_enhanced_dual_ioa_error(struct ipr_ioa_cfg *ioa_cfg,
struct ipr_hostrcb *hostrcb)
{
struct ipr_hostrcb_type_17_error *error;
+ char *reason;
error = &hostrcb->hcam.u.error.u.type_17_error;
error->failure_reason[sizeof(error->failure_reason) - 1] = '\0';
- strstrip(error->failure_reason);
+ reason = strstrip(error->failure_reason);
- ipr_hcam_err(hostrcb, "%s [PRC: %08X]\n", error->failure_reason,
+ ipr_hcam_err(hostrcb, "%s [PRC: %08X]\n", reason,
be32_to_cpu(hostrcb->hcam.u.error.prc));
ipr_log_ext_vpd_compact("Remote IOA", hostrcb, &error->vpd);
ipr_log_hex_data(ioa_cfg, error->data,
@@ -1356,12 +1357,13 @@ static void ipr_log_dual_ioa_error(struct ipr_ioa_cfg *ioa_cfg,
struct ipr_hostrcb *hostrcb)
{
struct ipr_hostrcb_type_07_error *error;
+ char *reason;
error = &hostrcb->hcam.u.error.u.type_07_error;
error->failure_reason[sizeof(error->failure_reason) - 1] = '\0';
- strstrip(error->failure_reason);
+ reason = strstrip(error->failure_reason);
- ipr_hcam_err(hostrcb, "%s [PRC: %08X]\n", error->failure_reason,
+ ipr_hcam_err(hostrcb, "%s [PRC: %08X]\n", reason,
be32_to_cpu(hostrcb->hcam.u.error.prc));
ipr_log_vpd_compact("Remote IOA", hostrcb, &error->vpd);
ipr_log_hex_data(ioa_cfg, error->data,
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index d27d315ec940..58dbcd1a4946 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -2019,7 +2019,6 @@ qla24xx_msix_rsp_q(int irq, void *dev_id)
struct rsp_que *rsp;
struct device_reg_24xx __iomem *reg;
struct scsi_qla_host *vha;
- unsigned long flags;
rsp = (struct rsp_que *) dev_id;
if (!rsp) {