From mboxrd@z Thu Jan 1 00:00:00 1970 From: James Bottomley Subject: Re: [patch] drivers/scsi/scsi_sysfs.c:718: warning: unused variable `rq' Date: Mon, 23 Jul 2007 09:53:51 -0500 Message-ID: <1185202432.3417.7.camel@localhost.localdomain> References: <20070723143637.GB23448@slug> Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 7bit Return-path: Received: from hancock.steeleye.com ([71.30.118.248]:52620 "EHLO hancock.sc.steeleye.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755291AbXGWOx4 (ORCPT ); Mon, 23 Jul 2007 10:53:56 -0400 In-Reply-To: <20070723143637.GB23448@slug> Sender: linux-scsi-owner@vger.kernel.org List-Id: linux-scsi@vger.kernel.org To: Frederik Deweerdt Cc: jens.axboe@oracle.com, fujita.tomonori@lab.ntt.co.jp, linux-kernel@vger.kernel.org, linux-scsi On Mon, 2007-07-23 at 16:36 +0200, Frederik Deweerdt wrote: > - struct request_queue *rq = sdev->request_queue; > > if ((error = scsi_device_set_state(sdev, SDEV_RUNNING)) != 0) > return error; > @@ -736,7 +735,8 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev) > * released by the sdev_class .release */ > get_device(&sdev->sdev_gendev); > > - error = bsg_register_queue(rq, &sdev->sdev_gendev, NULL); > + error = bsg_register_queue(sdev->request_queue, > + &sdev->sdev_gendev, NULL); Actually, that's not really a good fix because the same problem will reoccur elsewhere. This is a more correct fix: James diff --git a/include/linux/bsg.h b/include/linux/bsg.h index f415f89..2344dab 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 * rq, struct device *dev, const char *name) +{ + return 0; +} +static inline void bsg_unregister_queue(struct request_queue *rq) +{ +} #endif #endif /* __KERNEL__ */