2012-02-24 15:56:58

by Petr Uzel

[permalink] [raw]
Subject: [PATCH 1/2] [resend] [SCSI] sd: Adapt comment and printk string after renaming sd_init_command to sd_prep_fn

Make the comment and string in printk match the code after commit
7f9a6bc4e9d59e7fcf03ed23f60cd81ca5d80b65.

Signed-off-by: Petr Uzel <[email protected]>
Acked-by: Hannes Reinecke <[email protected]>
---
drivers/scsi/sd.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index c691fb5..7c0d345 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -634,7 +634,7 @@ static void sd_unprep_fn(struct request_queue *q, struct request *rq)
}

/**
- * sd_init_command - build a scsi (read or write) command from
+ * sd_prep_fn - build a scsi (read or write) command from
* information in the request structure.
* @SCpnt: pointer to mid-level's per scsi command structure that
* contains request and into which the scsi command is written
@@ -681,7 +681,7 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)
ret = BLKPREP_KILL;

SCSI_LOG_HLQUEUE(1, scmd_printk(KERN_INFO, SCpnt,
- "sd_init_command: block=%llu, "
+ "sd_prep_fn: block=%llu, "
"count=%d\n",
(unsigned long long)block,
this_count));
--
1.7.7


2012-02-24 15:56:59

by Petr Uzel

[permalink] [raw]
Subject: [PATCH 2/2] [resend] [SCSI] sd: Adapt comment and printk string after renaming sd_attach to sd_probe

Make the comment and printk string match the code.

Signed-off-by: Petr Uzel <[email protected]>
Acked-by: Hannes Reinecke <[email protected]>
---
drivers/scsi/sd.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 7c0d345..8eea785 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -2562,8 +2562,8 @@ static void sd_probe_async(void *data, async_cookie_t cookie)
* (e.g. /dev/sda). More precisely it is the block device major
* and minor number that is chosen here.
*
- * Assume sd_attach is not re-entrant (for time being)
- * Also think about sd_attach() and sd_remove() running coincidentally.
+ * Assume sd_probe is not re-entrant (for time being)
+ * Also think about sd_probe() and sd_remove() running coincidentally.
**/
static int sd_probe(struct device *dev)
{
@@ -2578,7 +2578,7 @@ static int sd_probe(struct device *dev)
goto out;

SCSI_LOG_HLQUEUE(3, sdev_printk(KERN_INFO, sdp,
- "sd_attach\n"));
+ "sd_probe\n"));

error = -ENOMEM;
sdkp = kzalloc(sizeof(*sdkp), GFP_KERNEL);
--
1.7.7