From patchwork Tue Nov 17 18:23:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Zary X-Patchwork-Id: 7640371 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0DF69BF90C for ; Tue, 17 Nov 2015 18:25:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 430DA204AD for ; Tue, 17 Nov 2015 18:25:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F0875204D1 for ; Tue, 17 Nov 2015 18:24:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754521AbbKQSYu (ORCPT ); Tue, 17 Nov 2015 13:24:50 -0500 Received: from ns.gsystem.sk ([62.176.172.50]:56417 "EHLO gsystem.sk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754498AbbKQSYr (ORCPT ); Tue, 17 Nov 2015 13:24:47 -0500 Received: from stip-static-68.213-81-217.telecom.sk ([213.81.217.68] helo=gsql.ggedos.sk) by gsystem.sk with esmtpsa (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.80) (envelope-from ) id 1Zykvs-0006dg-K0; Tue, 17 Nov 2015 19:24:44 +0100 From: Ondrej Zary To: "Martin K. Petersen" Cc: Christoph Hellwig , linux-scsi@vger.kernel.org Subject: [PATCH 02/52] atp870u: Remove tmport1 Date: Tue, 17 Nov 2015 19:23:38 +0100 Message-Id: <1447784668-23713-3-git-send-email-linux@rainbow-software.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1447784668-23713-1-git-send-email-linux@rainbow-software.org> References: <1447784668-23713-1-git-send-email-linux@rainbow-software.org> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Remove tmport1 temporary variable to simplify the code. Signed-off-by: Ondrej Zary --- drivers/scsi/atp870u.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/atp870u.c b/drivers/scsi/atp870u.c index 3db9d0c..aac7d47 100644 --- a/drivers/scsi/atp870u.c +++ b/drivers/scsi/atp870u.c @@ -51,7 +51,7 @@ static irqreturn_t atp870u_intr_handle(int irq, void *dev_id) unsigned char i, j, c, target_id, lun,cmdp; unsigned char *prd; struct scsi_cmnd *workreq; - unsigned int tmport, tmport1; + unsigned int tmport; unsigned long adrcnt, k; #ifdef ED_DBGP unsigned long l; @@ -78,9 +78,8 @@ ch_sel: cmdp = inb(dev->ioport[c] + 0x10); if (dev->working[c] != 0) { if (dev->dev_id == ATP885_DEVID) { - tmport1 = dev->ioport[c] + 0x16; - if ((inb(tmport1) & 0x80) == 0) - outb((inb(tmport1) | 0x80), tmport1); + if ((inb(dev->ioport[c] + 0x16) & 0x80) == 0) + outb((inb(dev->ioport[c] + 0x16) | 0x80), dev->ioport[c] + 0x16); } tmpcip = dev->pciport[c]; if ((inb(tmpcip) & 0x08) != 0)