mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-15 08:14:15 +08:00
[SCSI] sd: make comment and printk string match code
Adapt comment and printk string after renaming sd_init_command to sd_prep_fn Adapt comment and printk string after renaming sd_attach to sd_probe Signed-off-by: Petr Uzel <petr.uzel@suse.cz> Acked-by: Hannes Reinecke <hare@suse.de> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
parent
7a3e97b0dc
commit
2db93ce8cc
@ -664,7 +664,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
|
||||
@ -711,7 +711,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));
|
||||
@ -2649,8 +2649,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)
|
||||
{
|
||||
@ -2665,7 +2665,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);
|
||||
|
Loading…
Reference in New Issue
Block a user