From patchwork Thu Oct 18 13:15:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10647189 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 781A813B0 for ; Thu, 18 Oct 2018 13:15:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B10328956 for ; Thu, 18 Oct 2018 13:15:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5F8762892C; Thu, 18 Oct 2018 13:15:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 046BF28928 for ; Thu, 18 Oct 2018 13:15:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727391AbeJRVQY (ORCPT ); Thu, 18 Oct 2018 17:16:24 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:35698 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726871AbeJRVQY (ORCPT ); Thu, 18 Oct 2018 17:16:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=OJkdiMRRyv2SWNPAZgAVQDxcvGPI764qPKu5x885xLk=; b=GiGUQkY3HA3e1htxLxSuBM2/Vo I3yLR+ik+SAS5B3uP9F6vUJ9aRVESGAiIAUfH0YbOpiqioKk/bfBTt3d/UDEccgQZsk1RxCus/HF7 Ep+oqbGQTmXLqiMD8m546LLFZV/2hVL1G/gUpokMSgW9kzgfypuguxN1XIN0MLgN+l7ym7hcRaxhb UPCAtKCqFdv3rd0/GRdXCXQpqwkiOkdEcJGhUP3UbzFjZvE8prXslMmqqTj47HcmEL14jZqR5gYq9 ULBgHMuYib2tITebgb3d8Pquq+brPw7ogGWE/FHMpGHtRHRJ29PEKxp335888mXwTMggkVFGBt2Oi jBqEjEhA==; Received: from 089144199123.atnat0008.highway.a1.net ([89.144.199.123] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1gD896-0003hI-6b; Thu, 18 Oct 2018 13:15:24 +0000 From: Christoph Hellwig To: Jens Axboe Cc: Joshua Morris , Philip Kelleher , linux-block@vger.kernel.org Subject: [PATCH 2/6] sx8: remove dead IF_64BIT_DMA_IS_POSSIBLE code Date: Thu, 18 Oct 2018 15:15:12 +0200 Message-Id: <20181018131516.10629-3-hch@lst.de> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181018131516.10629-1-hch@lst.de> References: <20181018131516.10629-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This code has effectively been commented out since the first commit, so remove it. Signed-off-by: Christoph Hellwig --- drivers/block/sx8.c | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c index 16f37254bcf4..377c17e106c3 100644 --- a/drivers/block/sx8.c +++ b/drivers/block/sx8.c @@ -197,7 +197,6 @@ enum { FL_NON_RAID = FW_VER_NON_RAID, FL_4PORT = FW_VER_4PORT, FL_FW_VER_MASK = (FW_VER_NON_RAID | FW_VER_4PORT), - FL_DAC = (1 << 16), FL_DYN_MAJOR = (1 << 17), }; @@ -1585,7 +1584,6 @@ static int carm_init_shm(struct carm_host *host) static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) { struct carm_host *host; - unsigned int pci_dac; int rc; struct request_queue *q; unsigned int i; @@ -1600,28 +1598,12 @@ static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) if (rc) goto err_out; -#ifdef IF_64BIT_DMA_IS_POSSIBLE /* grrrr... */ - rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(64)); - if (!rc) { - rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)); - if (rc) { - printk(KERN_ERR DRV_NAME "(%s): consistent DMA mask failure\n", - pci_name(pdev)); - goto err_out_regions; - } - pci_dac = 1; - } else { -#endif - rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); - if (rc) { - printk(KERN_ERR DRV_NAME "(%s): DMA mask failure\n", - pci_name(pdev)); - goto err_out_regions; - } - pci_dac = 0; -#ifdef IF_64BIT_DMA_IS_POSSIBLE /* grrrr... */ + rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); + if (rc) { + printk(KERN_ERR DRV_NAME "(%s): DMA mask failure\n", + pci_name(pdev)); + goto err_out_regions; } -#endif host = kzalloc(sizeof(*host), GFP_KERNEL); if (!host) { @@ -1632,7 +1614,6 @@ static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) } host->pdev = pdev; - host->flags = pci_dac ? FL_DAC : 0; spin_lock_init(&host->lock); INIT_WORK(&host->fsm_task, carm_fsm_task); init_completion(&host->probe_comp);