Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp2877954ybv; Mon, 24 Feb 2020 13:30:28 -0800 (PST) X-Google-Smtp-Source: APXvYqxV+XDMJY8PACGvwGGygUmYVYug+JDZQ9SEr9bHoEYuXcum8mDIP82vMlNRwYVk+XOaipvR X-Received: by 2002:a9d:4c81:: with SMTP id m1mr41741674otf.5.1582579828195; Mon, 24 Feb 2020 13:30:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582579828; cv=none; d=google.com; s=arc-20160816; b=I2pxHzNFqxBiUFre6I4pTNkBxJV+yUVuiygUbs4B1OWzwuB9AkiB2Tq2xOW62MdA91 rKcu7Wd7RZGEjwtpxP6WYCrf3XgpETjZ1ESMrbb5oQnfo3IWp6bWQZoYkCXApV743A5E JKCvLh25p4WnS5AISdwh8D6ip/63IRbvg20O7ZVtXcC0dH1KYskRgHJlnQEdlPSpHZ0V i/jBJKgwddLdfEhjF5LbWqz2wpDjUNVMqOW+SQ+mVpfC9mT9VGrJvWCX9AOtzxEo5/PB AFdg9zEAo71+6+saN9i0lNaxlNsra6XHPsjF2/e0h8hmDNTf3vebzPP5kr4PqNbv/JcA OJ/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:references:cc:to:from:subject:dkim-signature; bh=JL4Q1l1W07XAcq8S0r/D3xLT9kgasro6XokOt1NtSiI=; b=WxrfXPSuZREHEKqPl0YEMHHzD7nzeiBmSazq7xqf2yuPCIlxcoQKOyHqDf4XP2soOl EiEi5hg6LrPebJZydgVy1uI7QzBuj0q4bcjYVJMD/b2bUWGYmh3KPobvUtzmSjLsXLoq bCxWZzNe4MwzkuJzOpeZW4hoG8zXl/YhennovtEYa7snuD/k3h55rdiSatqpijBsTVDz dDo1YnAFdg7Ckyg0cvLIjPez/8IzbckOvqdFZiUp8XJlfap+stF4TXZMXyFJ3ekJ++qo /kUoDuNzwiWYIz5SO8cKDQODTHWWOgNVOtfZYLGRugl05rS8S5z/FFgEY9DX6YJFVfTd fiyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=BYdR5fWu; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q19si6395740otm.221.2020.02.24.13.30.15; Mon, 24 Feb 2020 13:30:28 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=BYdR5fWu; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728346AbgBXV3y (ORCPT + 99 others); Mon, 24 Feb 2020 16:29:54 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:41709 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727803AbgBXV3v (ORCPT ); Mon, 24 Feb 2020 16:29:51 -0500 Received: by mail-wr1-f66.google.com with SMTP id c9so12178390wrw.8; Mon, 24 Feb 2020 13:29:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=JL4Q1l1W07XAcq8S0r/D3xLT9kgasro6XokOt1NtSiI=; b=BYdR5fWu5PM7sPeiZNrXvPjplX9eI95U0p1mvnSV2rx+HATPRQSiRSCKdo7CCa4Pcw ZtezCeaS7PWljCDQT7JFNssRaTxbzgDdMunmzfeG21KHdchGXf6fGugvEpAQzMSjD8hf FT6LrSfl8xr8RIy/o8AoHRWr1eJEE0rt2O0GXAJNHFJGm7bni6b2Gmz/AzKBCbxQ6XOd ejPljkC1LLv/qfzK3GBTitRaXIhliVH9MOtOqyQ4Fxd/zf4ob8lhEWy9YkSw7+3TScJZ T+67+cjFwIEUcpWh4qGf2L/vDh6hZp0sk/W2TMyESohKqjuW4YtsurhAcxdFZKvSJxXb M6rA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=JL4Q1l1W07XAcq8S0r/D3xLT9kgasro6XokOt1NtSiI=; b=CFLf4PnhqGbPd/Y4C5rFUcaPDfvrEhqoVMRST4xZicgpN63UEwBuYNlRXXFI4f4hgv 42Tor8mhhbj8tLRaedsqGZ/UUQwOtPpCmFMT6AlaJbCFlpm3Y8xZUEDzlJU4F5cCGkg8 TR0zUaMT57IwkkvsVSvbZRQKCq9UY4SmULnGg0yga6BevOC6IsQkqGuAREnFQAu10PTo Fmr02hMtbTBOyfS4/Wx3ynMtMT0IZtnsjw0JkH8kyCAaRNNtcaGeVp0ympH3vOxkAakK tDXBblfmGa7L9i1xrwsMSIpsWnHZHSE++45ZyLpUKqq1wMamOtt4H1vdyg63YiGu1D1A rX4A== X-Gm-Message-State: APjAAAUhHsEAzNGoGdP+N/iV6RQVoFaYBWG52ifQAzrQoK4KbP2ronH/ RDyvAAoRiOntwCq3h4q4FEM= X-Received: by 2002:a5d:5609:: with SMTP id l9mr6032121wrv.48.1582579789183; Mon, 24 Feb 2020 13:29:49 -0800 (PST) Received: from ?IPv6:2003:ea:8f29:6000:3d90:eff:31bc:c6a9? (p200300EA8F2960003D900EFF31BCC6A9.dip0.t-ipconnect.de. [2003:ea:8f29:6000:3d90:eff:31bc:c6a9]) by smtp.googlemail.com with ESMTPSA id a26sm979781wmm.18.2020.02.24.13.29.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 24 Feb 2020 13:29:48 -0800 (PST) Subject: [PATCH 6/8] net: skfp: use PCI_STATUS_ERROR_BITS From: Heiner Kallweit To: Bjorn Helgaas , Realtek linux nic maintainers , David Miller , Mirko Lindner , Stephen Hemminger , Clemens Ladisch , Jaroslav Kysela , Takashi Iwai Cc: "linux-pci@vger.kernel.org" , Linux Kernel Mailing List , "netdev@vger.kernel.org" , alsa-devel@alsa-project.org References: <5939f711-92aa-e7ed-2a26-4f1e4169f786@gmail.com> Message-ID: <9f708ee4-6ff9-9af0-bb3a-6ad0b48a3f5e@gmail.com> Date: Mon, 24 Feb 2020 22:27:12 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <5939f711-92aa-e7ed-2a26-4f1e4169f786@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use new constant PCI_STATUS_ERROR_BITS to simplify the code. Signed-off-by: Heiner Kallweit --- drivers/net/fddi/skfp/drvfbi.c | 2 +- drivers/net/fddi/skfp/h/skfbi.h | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/net/fddi/skfp/drvfbi.c b/drivers/net/fddi/skfp/drvfbi.c index 9c8aa3a95..d5937aff5 100644 --- a/drivers/net/fddi/skfp/drvfbi.c +++ b/drivers/net/fddi/skfp/drvfbi.c @@ -112,7 +112,7 @@ static void card_start(struct s_smc *smc) */ outp(ADDR(B0_TST_CTRL), TST_CFG_WRITE_ON) ; /* enable for writes */ word = inpw(PCI_C(PCI_STATUS)) ; - outpw(PCI_C(PCI_STATUS), word | PCI_ERRBITS) ; + outpw(PCI_C(PCI_STATUS), word | PCI_STATUS_ERROR_BITS) ; outp(ADDR(B0_TST_CTRL), TST_CFG_WRITE_OFF) ; /* disable writes */ /* diff --git a/drivers/net/fddi/skfp/h/skfbi.h b/drivers/net/fddi/skfp/h/skfbi.h index 480795681..ccee00b71 100644 --- a/drivers/net/fddi/skfp/h/skfbi.h +++ b/drivers/net/fddi/skfp/h/skfbi.h @@ -33,11 +33,6 @@ */ #define I2C_ADDR_VPD 0xA0 /* I2C address for the VPD EEPROM */ - -#define PCI_ERRBITS (PCI_STATUS_DETECTED_PARITY | PCI_STATUS_SIG_SYSTEM_ERROR | PCI_STATUS_REC_MASTER_ABORT | PCI_STATUS_SIG_TARGET_ABORT | PCI_STATUS_PARITY) - - - /* * Control Register File: * Bank 0 -- 2.25.1