From: Dan Williams <dan.j.williams@intel.com>
To: linux-scsi@vger.kernel.org
Cc: Maciej Trela <maciej.trela@intel.com>
Subject: [3.2-rc PATCH 7/8] isci: remove unused 'isci_tmf->device' field
Date: Fri, 16 Dec 2011 16:53:46 -0800 [thread overview]
Message-ID: <20111217005346.14133.40914.stgit@localhost6.localdomain6> (raw)
In-Reply-To: <20111217004820.14133.19249.stgit@localhost6.localdomain6>
From: Maciej Trela <maciej.trela@intel.com>
As the field was never set, isci_print_tmf() using 'isci_tmf->device'
sometimes causes a kernel crash if the dev_dbg() statement is enabled.
Remove the unused field both from isci_tmf struct definition and from
isci_print_tmf()
Signed-off-by: Maciej Trela <maciej.trela@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---
drivers/scsi/isci/task.c | 2 +-
drivers/scsi/isci/task.h | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/scsi/isci/task.c b/drivers/scsi/isci/task.c
index 66ad3dc..f5a3f7d 100644
--- a/drivers/scsi/isci/task.c
+++ b/drivers/scsi/isci/task.c
@@ -496,7 +496,7 @@ static int isci_task_execute_tmf(struct isci_host *ihost,
}
}
- isci_print_tmf(tmf);
+ isci_print_tmf(ihost, tmf);
if (tmf->status == SCI_SUCCESS)
ret = TMF_RESP_FUNC_COMPLETE;
diff --git a/drivers/scsi/isci/task.h b/drivers/scsi/isci/task.h
index bc78c0a..1b27b37 100644
--- a/drivers/scsi/isci/task.h
+++ b/drivers/scsi/isci/task.h
@@ -106,7 +106,6 @@ struct isci_tmf {
} resp;
unsigned char lun[8];
u16 io_tag;
- struct isci_remote_device *device;
enum isci_tmf_function_codes tmf_code;
int status;
@@ -120,10 +119,10 @@ struct isci_tmf {
};
-static inline void isci_print_tmf(struct isci_tmf *tmf)
+static inline void isci_print_tmf(struct isci_host *ihost, struct isci_tmf *tmf)
{
if (SAS_PROTOCOL_SATA == tmf->proto)
- dev_dbg(&tmf->device->isci_port->isci_host->pdev->dev,
+ dev_dbg(&ihost->pdev->dev,
"%s: status = %x\n"
"tmf->resp.d2h_fis.status = %x\n"
"tmf->resp.d2h_fis.error = %x\n",
@@ -132,7 +131,7 @@ static inline void isci_print_tmf(struct isci_tmf *tmf)
tmf->resp.d2h_fis.status,
tmf->resp.d2h_fis.error);
else
- dev_dbg(&tmf->device->isci_port->isci_host->pdev->dev,
+ dev_dbg(&ihost->pdev->dev,
"%s: status = %x\n"
"tmf->resp.resp_iu.data_present = %x\n"
"tmf->resp.resp_iu.status = %x\n"
next prev parent reply other threads:[~2011-12-17 0:53 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-17 0:53 [GIT 3.2-rc PATCH 0/8] isci: platform and hardware enabling updates Dan Williams
2011-12-17 0:53 ` [3.2-rc PATCH 1/8] isci: cleanup oem parameter and recipe handling Dan Williams
2011-12-17 0:53 ` [3.2-rc PATCH 2/8] isci: update afe (analog-front-end) recipe for C1 Dan Williams
2011-12-17 0:53 ` [3.2-rc PATCH 3/8] isci: oem parameter format v1.1 (ssc select) Dan Williams
2011-12-17 0:53 ` [3.2-rc PATCH 4/8] isci: oem parameter format v1.3 (cable select) Dan Williams
2011-12-17 0:53 ` [3.2-rc PATCH 5/8] isci: performance-fix, shorten default "no outbound task" timeout Dan Williams
2011-12-17 0:53 ` [3.2-rc PATCH 6/8] isci: link speeds default to gen 2 Dan Williams
2011-12-17 0:53 ` Dan Williams [this message]
2011-12-17 0:53 ` [3.2-rc PATCH 8/8] isci: update version to 1.1 Dan Williams
2011-12-18 13:49 ` [GIT 3.2-rc PATCH 0/8] isci: platform and hardware enabling updates James Bottomley
2011-12-18 18:46 ` Williams, Dan J
2011-12-21 21:05 ` James Bottomley
2011-12-21 22:17 ` Dan Williams
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=20111217005346.14133.40914.stgit@localhost6.localdomain6 \
--to=dan.j.williams@intel.com \
--cc=linux-scsi@vger.kernel.org \
--cc=maciej.trela@intel.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