From patchwork Tue Jul 14 15:21:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Schulz X-Patchwork-Id: 11663107 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 19D5C618 for ; Tue, 14 Jul 2020 15:23:41 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E6999221E8 for ; Tue, 14 Jul 2020 15:23:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="1JuzNq4c" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E6999221E8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=mawsonlakes.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=9/j7bRQJX47fCMJGkpCIjABDUN2jRe8oHxyzFQrrveI=; b=1JuzNq4cutVoB6AG2iE3Iwo+PL vUDV2P+wjpAfQiathHG7Nwm9LJwMeFHUvQQXz4orLylnfcX8wXbX6F2LZqxMAUbEDB4IlQv7M3rET zCvZFLze+kSM2mF+5tdgNUz9ytIuDSXbxu7vNJlT5xnhG0TqBUAAcOottWAO7j1dl7i83fOzev/rh LzH/QUYber6Fb+PoowapjjGtRqXthl6h1YK+KOyncHgyiqTi67vS/gyCiIJ/cGUTYUpArezj2R+AK 5CGRtCOzI6twTfSf8fepTWyUpmCota58V/yyQIU8hnB53jbmxVfcZ+1rY/BEcG/brMfc6STyaI18v iQFB0zwg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jvMkR-0001eE-6u; Tue, 14 Jul 2020 15:21:35 +0000 Received: from ipmail03.adl2.internode.on.net ([150.101.137.141]) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jvMkN-0001dd-Pf for linux-arm-kernel@lists.infradead.org; Tue, 14 Jul 2020 15:21:33 +0000 X-SMTP-MATCH: 0 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2BHBAAAzQ1f/5UxyQ5ggRCBQ4NtX400hgieGQsBPAECBAEBhEYEAoIKJTcGDgIQAQEGAQEBAQEGBIZUhh0LASMjMB+BAoMmgnyqXjOJG4EpgTiIA4IogmGCAIERgmKFdoUHIgSPMBeLTok3kFmcMjCfMwGyeYF7fUOCaVAZDY4qF440NDA3AgYIAQEDCVcBj3QBAQ Received: from 14-201-49-149.tpgi.com.au (HELO silver.lan) ([14.201.49.149]) by ipmail03.adl2.internode.on.net with ESMTP; 15 Jul 2020 00:51:22 +0930 From: paul@mawsonlakes.org To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] Changes blacklist to quirklist in ecode.c file Date: Wed, 15 Jul 2020 00:51:04 +0930 Message-Id: <20200714152104.406151-1-paul@mawsonlakes.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200714_112132_124287_1747DB32 X-CRM114-Status: GOOD ( 12.23 ) X-Spam-Score: 1.0 (+) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (1.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [150.101.137.141 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [150.101.137.141 listed in wl.mailspike.net] 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , List-Id: Cc: soc@kernel.org, linux@armlinux.org.uk, arnd@arndb.de, paul@mawsonlakes.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Paul Schulz This is a functionally trivial patch which removes the word 'blacklist' (and variations) from this code and replaces it with 'quirklist' It has no other effect. Signed-off-by: Paul Schulz --- arch/arm/mach-rpc/ecard.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/arm/mach-rpc/ecard.c b/arch/arm/mach-rpc/ecard.c index 75cfad2cb143..d5129ab504b1 100644 --- a/arch/arm/mach-rpc/ecard.c +++ b/arch/arm/mach-rpc/ecard.c @@ -63,7 +63,7 @@ struct ecard_request { struct completion *complete; }; -struct expcard_blacklist { +struct expcard_quirklist { unsigned short manufacturer; unsigned short product; const char *type; @@ -79,7 +79,7 @@ static void atomwide_3p_quirk(ecard_t *ec); /* List of descriptions of cards which don't have an extended * identification, or chunk directories containing a description. */ -static struct expcard_blacklist __initdata blacklist[] = { +static struct expcard_quirklist __initdata quirklist[] = { { MANU_ACORN, PROD_ACORN_ETHER1, "Acorn Ether1" }, { MANU_ATOMWIDE, PROD_ATOMWIDE_3PSERIAL, NULL, atomwide_3p_quirk }, }; @@ -867,7 +867,7 @@ void __iomem *ecardm_iomap(struct expansion_card *ec, unsigned int res, start += offset; if (maxsize && end - start > maxsize) end = start + maxsize; - + return devm_ioremap(&ec->dev, start, end - start); } EXPORT_SYMBOL(ecardm_iomap); @@ -879,7 +879,7 @@ static void atomwide_3p_quirk(ecard_t *ec) /* Disable interrupts on each port */ for (i = 0x2000; i <= 0x2800; i += 0x0400) - writeb(0, addr + i + 4); + writeb(0, addr + i + 4); } /* @@ -935,15 +935,15 @@ static int __init ecard_probe(int slot, unsigned irq, card_type_t type) ec->fiqmask = 4; } - for (i = 0; i < ARRAY_SIZE(blacklist); i++) - if (blacklist[i].manufacturer == ec->cid.manufacturer && - blacklist[i].product == ec->cid.product) { - if (blacklist[i].type) - ec->card_desc = blacklist[i].type; - if (blacklist[i].init) - blacklist[i].init(ec); - break; - } + for (i = 0; i < ARRAY_SIZE(quirklist); i++) + if (quirklist[i].manufacturer == ec->cid.manufacturer && + quirklist[i].product == ec->cid.product) { + if (quirklist[i].type) + ec->card_desc = quirklist[i].type; + if (quirklist[i].init) + quirklist[i].init(ec); + break; + } ec->irq = irq;