[PATCH] bsg: Fix warning with CONFIG_BLK_DEV_BSG=n

[PATCH] bsg: Fix warning with CONFIG_BLK_DEV_BSG=n

[Roland Dreier]

The current stub definitions of bsg_register_queue() and
bsg_unregister_queue() as macros leads to

    drivers/scsi/scsi_sysfs.c: In function 'scsi_sysfs_add_sdev':
    drivers/scsi/scsi_sysfs.c:718: warning: unused variable 'rq'

because the first parameter of bsg_register_queue() is completely
discarded.  As akpm says, "program in C, not in cpp."  We might as
well get a little bit better type-checking when we fix this by
converting the stubs to empty inline functions.

Signed-off-by: Roland Dreier <rolandd@cisco.com>
---
 include/linux/bsg.h |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/include/linux/bsg.h b/include/linux/bsg.h
index f415f89..69e23e1 100644
--- a/include/linux/bsg.h
+++ b/include/linux/bsg.h
@@ -60,8 +60,13 @@ struct bsg_class_device {
 extern int bsg_register_queue(struct request_queue *, struct device *, const char *);
 extern void bsg_unregister_queue(struct request_queue *);
 #else
-#define bsg_register_queue(disk, dev, name)		(0)
-#define bsg_unregister_queue(disk)	do { } while (0)
+static inline int bsg_register_queue(struct request_queue *q, struct device *gdev,
+				     const char *name)
+{
+	return 0;
+}
+
+static inline void bsg_unregister_queue(struct request_queue *q) { }
 #endif
 
 #endif /* __KERNEL__ */

Re: [PATCH] bsg: Fix warning with CONFIG_BLK_DEV_BSG=n

[Jens Axboe]

On Sat, Jul 28 2007, Roland Dreier wrote:
> The current stub definitions of bsg_register_queue() and
> bsg_unregister_queue() as macros leads to
> 
>     drivers/scsi/scsi_sysfs.c: In function 'scsi_sysfs_add_sdev':
>     drivers/scsi/scsi_sysfs.c:718: warning: unused variable 'rq'
> 
> because the first parameter of bsg_register_queue() is completely
> discarded.  As akpm says, "program in C, not in cpp."  We might as
> well get a little bit better type-checking when we fix this by
> converting the stubs to empty inline functions.

James should already have that patch queued for inclusion since last
week.

-- 
Jens Axboe

Re: [PATCH] bsg: Fix warning with CONFIG_BLK_DEV_BSG=n

[Roland Dreier]

 > James should already have that patch queued for inclusion since last
 > week.

OK thanks, I missed seeing it go by.