From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Hellwig Subject: Re: linux-next: build warning after merge of the block tree Date: Mon, 14 May 2018 10:29:51 +0200 Message-ID: <20180514082951.GA20978@lst.de> References: <20180514125139.459a058d@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <20180514125139.459a058d@canb.auug.org.au> Sender: linux-kernel-owner@vger.kernel.org To: Stephen Rothwell Cc: Jens Axboe , Linux-Next Mailing List , Linux Kernel Mailing List , Christoph Hellwig List-Id: linux-next.vger.kernel.org On Mon, May 14, 2018 at 12:51:39PM +1000, Stephen Rothwell wrote: > Hi all, > > After merging the block tree, today's linux-next build (x86_64 > allmodconfig) produced this warning: The look entirely correct, but oddly enough my compiler did not bother to warn. Fix below: -- >>From 6610bd5bbbf05fa1d925b0601a09e84cada9e0a2 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Mon, 14 May 2018 10:24:34 +0200 Subject: memstick: remove unused variables Fixes: 7c2d748e8476 ("memstick: don't call blk_queue_bounce_limit") Reported-by: Stephen Rothwell Signed-off-by: Christoph Hellwig --- drivers/memstick/core/ms_block.c | 1 - drivers/memstick/core/mspro_block.c | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/memstick/core/ms_block.c b/drivers/memstick/core/ms_block.c index b2d025f42d14..a15181fa45f7 100644 --- a/drivers/memstick/core/ms_block.c +++ b/drivers/memstick/core/ms_block.c @@ -2094,7 +2094,6 @@ static const struct block_device_operations msb_bdops = { static int msb_init_disk(struct memstick_dev *card) { struct msb_data *msb = memstick_get_drvdata(card); - struct memstick_host *host = card->host; int rc; unsigned long capacity; diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c index a2fadc605750..5ee932631fae 100644 --- a/drivers/memstick/core/mspro_block.c +++ b/drivers/memstick/core/mspro_block.c @@ -1170,7 +1170,6 @@ static int mspro_block_init_card(struct memstick_dev *card) static int mspro_block_init_disk(struct memstick_dev *card) { struct mspro_block_data *msb = memstick_get_drvdata(card); - struct memstick_host *host = card->host; struct mspro_devinfo *dev_info = NULL; struct mspro_sys_info *sys_info = NULL; struct mspro_sys_attr *s_attr = NULL; -- 2.17.0