Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa98192d authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe
Browse files

block: Fix kernel-doc warnings reported when building with W=1 



Commit 3a025e1d ("Add optional check for bad kernel-doc comments")
causes W=1 the kernel-doc script to be run and thereby causes several
new warnings to appear when building the kernel with W=1. Fix the
block layer kernel-doc headers such that the block layer again builds
cleanly with W=1.

Signed-off-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent ee3e4de5

block/bsg-lib.c

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 


/**

 * bsg_teardown_job - routine to teardown a bsg job

 * @job: bsg_job that is to be torn down

 * @kref: kref inside bsg_job that is to be torn down

 */

static void bsg_teardown_job(struct kref *kref)

{
@@ -251,6 +251,7 @@ static void bsg_exit_rq(struct request_queue *q, struct request *req) 
 * @name: device to give bsg device

 * @job_fn: bsg job handler

 * @dd_job_size: size of LLD data needed for each job

 * @release: @dev release function

 */

struct request_queue *bsg_setup_queue(struct device *dev, const char *name,

		bsg_job_fn *job_fn, int dd_job_size,

block/scsi_ioctl.c

+3 −2
Original line number Diff line number Diff line
@@ -384,9 +384,10 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk, 


/**

 * sg_scsi_ioctl  --  handle deprecated SCSI_IOCTL_SEND_COMMAND ioctl

 * @file:	file this ioctl operates on (optional)

 * @q:		request queue to send scsi commands down

 * @disk:	gendisk to operate on (option)

 * @mode:	mode used to open the file through which the ioctl has been

 *		submitted

 * @sic:	userspace structure describing the command to perform

 *

 * Send down the scsi command described by @sic to the device below
@@ -415,10 +416,10 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk, 
 *      Positive numbers returned are the compacted SCSI error codes (4

 *      bytes in one int) where the lowest byte is the SCSI status.

 */

#define OMAX_SB_LEN 16          /* For backward compatibility */

int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,

		struct scsi_ioctl_command __user *sic)

{

	enum { OMAX_SB_LEN = 16 };	/* For backward compatibility */

	struct request *rq;

	struct scsi_request *req;

	int err;