From patchwork Thu Jan 16 11:56:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 11336607 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3D5AE184C for ; Thu, 16 Jan 2020 11:57:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1C6B1208C3 for ; Thu, 16 Jan 2020 11:57:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726553AbgAPL47 (ORCPT ); Thu, 16 Jan 2020 06:56:59 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:40198 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726045AbgAPL46 (ORCPT ); Thu, 16 Jan 2020 06:56:58 -0500 Received: from DGGEMS403-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 8B6998A51B80C1E0246C; Thu, 16 Jan 2020 19:56:55 +0800 (CST) Received: from huawei.com (10.175.124.28) by DGGEMS403-HUB.china.huawei.com (10.3.19.203) with Microsoft SMTP Server id 14.3.439.0; Thu, 16 Jan 2020 19:56:48 +0800 From: yu kuai To: , , CC: , , , , Subject: [PATCH 1/3] scsi: aic7xxx: remove set but not used variable 'tinfo' Date: Thu, 16 Jan 2020 19:56:01 +0800 Message-ID: <20200116115603.25386-2-yukuai3@huawei.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20200116115603.25386-1-yukuai3@huawei.com> References: <20200116115603.25386-1-yukuai3@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.124.28] X-CFilter-Loop: Reflected Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Fixes gcc '-Wunused-but-set-variable' warning: drivers/scsi/aic7xxx/aic7xxx_osm.c: In function ‘ahc_linux_target_alloc’: drivers/scsi/aic7xxx/aic7xxx_osm.c:567:30: warning: variable ‘tinfo’ set but not used [-Wunused-but-set-variable] It is never used, and so can be removed. Signed-off-by: yu kuai --- drivers/scsi/aic7xxx/aic7xxx_osm.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c index d5c4a0d23706..e99aa154f77a 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_osm.c +++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c @@ -564,7 +564,6 @@ ahc_linux_target_alloc(struct scsi_target *starget) struct scsi_target **ahc_targp = ahc_linux_target_in_softc(starget); unsigned short scsirate; struct ahc_devinfo devinfo; - struct ahc_initiator_tinfo *tinfo; struct ahc_tmode_tstate *tstate; char channel = starget->channel + 'A'; unsigned int our_id = ahc->our_id; @@ -612,9 +611,6 @@ ahc_linux_target_alloc(struct scsi_target *starget) spi_max_offset(starget) = 0; spi_min_period(starget) = ahc_find_period(ahc, scsirate, maxsync); - - tinfo = ahc_fetch_transinfo(ahc, channel, ahc->our_id, - starget->id, &tstate); } ahc_compile_devinfo(&devinfo, our_id, starget->id, CAM_LUN_WILDCARD, channel, From patchwork Thu Jan 16 11:56:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 11336605 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CF55492A for ; Thu, 16 Jan 2020 11:57:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B745720663 for ; Thu, 16 Jan 2020 11:57:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726832AbgAPL5D (ORCPT ); Thu, 16 Jan 2020 06:57:03 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:40196 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726151AbgAPL47 (ORCPT ); Thu, 16 Jan 2020 06:56:59 -0500 Received: from DGGEMS403-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 94F55EC39D4C2347171C; Thu, 16 Jan 2020 19:56:55 +0800 (CST) Received: from huawei.com (10.175.124.28) by DGGEMS403-HUB.china.huawei.com (10.3.19.203) with Microsoft SMTP Server id 14.3.439.0; Thu, 16 Jan 2020 19:56:49 +0800 From: yu kuai To: , , CC: , , , , Subject: [PATCH 2/3] scsi: aic7xxx: remove set but not used variable 'ahc' Date: Thu, 16 Jan 2020 19:56:02 +0800 Message-ID: <20200116115603.25386-3-yukuai3@huawei.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20200116115603.25386-1-yukuai3@huawei.com> References: <20200116115603.25386-1-yukuai3@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.124.28] X-CFilter-Loop: Reflected Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Fixes gcc '-Wunused-but-set-variable' warning: drivers/scsi/aic7xxx/aic7xxx_osm.c: In function ‘ahc_linux_slave_configure’: drivers/scsi/aic7xxx/aic7xxx_osm.c:674:20: warning: variable ‘ahc’ set but not used [-Wunused-but-set-variable] It is never used, and so can be removed. Signed-off-by: yu kuai --- drivers/scsi/aic7xxx/aic7xxx_osm.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c index e99aa154f77a..2cda0736c989 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_osm.c +++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c @@ -667,10 +667,6 @@ ahc_linux_slave_alloc(struct scsi_device *sdev) static int ahc_linux_slave_configure(struct scsi_device *sdev) { - struct ahc_softc *ahc; - - ahc = *((struct ahc_softc **)sdev->host->hostdata); - if (bootverbose) sdev_printk(KERN_INFO, sdev, "Slave Configure\n"); From patchwork Thu Jan 16 11:56:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 11336603 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D45E91820 for ; Thu, 16 Jan 2020 11:57:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BC21F208C3 for ; Thu, 16 Jan 2020 11:57:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726418AbgAPL5H (ORCPT ); Thu, 16 Jan 2020 06:57:07 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:8743 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726045AbgAPL5E (ORCPT ); Thu, 16 Jan 2020 06:57:04 -0500 Received: from DGGEMS403-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 8E698F5D170390AB16E8; Thu, 16 Jan 2020 19:57:00 +0800 (CST) Received: from huawei.com (10.175.124.28) by DGGEMS403-HUB.china.huawei.com (10.3.19.203) with Microsoft SMTP Server id 14.3.439.0; Thu, 16 Jan 2020 19:56:50 +0800 From: yu kuai To: , , CC: , , , , Subject: [PATCH 3/3] scsi: aic7xxx: remove set but not used variable 'targ' Date: Thu, 16 Jan 2020 19:56:03 +0800 Message-ID: <20200116115603.25386-4-yukuai3@huawei.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20200116115603.25386-1-yukuai3@huawei.com> References: <20200116115603.25386-1-yukuai3@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.124.28] X-CFilter-Loop: Reflected Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Fixes gcc '-Wunused-but-set-variable' warning: drivers/scsi/aic7xxx/aic7xxx_osm.c: In function ‘ahc_send_async’: drivers/scsi/aic7xxx/aic7xxx_osm.c:1611:28: warning: variable ‘targ’ set but not used [-Wunused-but-set-variable] It is never used, and so can be removed. In this case scsi_transport_target_data() can be removed because of no caller exist. Signed-off-by: yu kuai --- drivers/scsi/aic7xxx/aic7xxx_osm.c | 2 -- include/scsi/scsi_transport.h | 10 +--------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c index 2cda0736c989..33fc55c6b2f4 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_osm.c +++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c @@ -1600,7 +1600,6 @@ ahc_send_async(struct ahc_softc *ahc, char channel, case AC_TRANSFER_NEG: { struct scsi_target *starget; - struct ahc_linux_target *targ; struct ahc_initiator_tinfo *tinfo; struct ahc_tmode_tstate *tstate; int target_offset; @@ -1634,7 +1633,6 @@ ahc_send_async(struct ahc_softc *ahc, char channel, starget = ahc->platform_data->starget[target_offset]; if (starget == NULL) break; - targ = scsi_transport_target_data(starget); target_ppr_options = (spi_dt(starget) ? MSG_EXT_PPR_DT_REQ : 0) diff --git a/include/scsi/scsi_transport.h b/include/scsi/scsi_transport.h index a0458bda3148..2cffdb34721d 100644 --- a/include/scsi/scsi_transport.h +++ b/include/scsi/scsi_transport.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -/* +/* * Transport specific attributes. * * Copyright (c) 2003 Silicon Graphics, Inc. All rights reserved. @@ -68,14 +68,6 @@ scsi_transport_reserve_device(struct scsi_transport_template * t, int space) t->device_size = t->device_private_offset + space; } static inline void * -scsi_transport_target_data(struct scsi_target *starget) -{ - struct Scsi_Host *shost = dev_to_shost(&starget->dev); - return (u8 *)starget->starget_data - + shost->transportt->target_private_offset; - -} -static inline void * scsi_transport_device_data(struct scsi_device *sdev) { struct Scsi_Host *shost = sdev->host;