From patchwork Tue Jul 14 14:05:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Schulz X-Patchwork-Id: 11662957 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 49F92138C for ; Tue, 14 Jul 2020 14:08:12 +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 22E3022510 for ; Tue, 14 Jul 2020 14:08:12 +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="ofraOuIN" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 22E3022510 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:References:In-Reply-To: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:List-Owner; bh=AUK0rHb/75z14Ads2pF7GZb+6lVz3oPVFyLYrRbU4oc=; b=ofraOuINl6GUxx9zwLGx9wJ+H pOKDkKiTEAwhN/IT3FP0sGa4ZkJRY/yksCsP6Rw0FSp9vas08wKPiW/M/pVOJ03O47fpdINkVb7cQ GowRKu9h3zEJe83vwRshdA8h+7CEgRsIVURxgY3fCQso5QY0qFLtKgXrjJMAl6mx7mpzYt3/9im3y UnR2Coe9QFbpZaQVlnlt5Wb7A/edzS98HhqILtlQWIVMQAuVpFWYZZtwE0Ljz1mhHKbSrSQ10CvSE nPMvIzhU8ZYCRp/u2tMECnSKYyxfzU6Kd2mrxFiIZoW8A5SJetjwljQnEuf0C1999ExXHkjOUckS0 WZ79+obfg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jvLZv-0006lu-CQ; Tue, 14 Jul 2020 14:06:39 +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 1jvLZp-0006ku-Rt for linux-arm-kernel@lists.infradead.org; Tue, 14 Jul 2020 14:06:36 +0000 X-SMTP-MATCH: 0 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2DKBABwuw1f/5UxyQ5gHgEBCxIMR4UwX400hgqCEJwJCwE8AQIEAQGERgQCAoIHJTgTAhABAQYBAQEBAQYEhlSFcAYnCwEjIxAgHxJXGYMmgnyqSTOJP4EpgTiIA4IogmGCAIERgmKFdoUHIgSPMBeLTpoQnDIwnzMBsnqBen1DgmlQGQ2OKheONDQwNwIGCAEBAwlXAY90AQE Received: from 14-201-49-149.tpgi.com.au (HELO silver.lan) ([14.201.49.149]) by ipmail03.adl2.internode.on.net with ESMTP; 14 Jul 2020 23:36:21 +0930 From: paul@mawsonlakes.org To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] Changes blacklist to blocklist in ecode.c file Date: Tue, 14 Jul 2020 23:35:57 +0930 Message-Id: <20200714140557.401403-2-paul@mawsonlakes.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200714140557.401403-1-paul@mawsonlakes.org> References: <20200714140557.401403-1-paul@mawsonlakes.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200714_100634_207161_A00A1A00 X-CRM114-Status: GOOD ( 12.07 ) 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, arnd@arndb.de, Paul Schulz Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Paul Schulz --- arch/arm/mach-rpc/ecard.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-rpc/ecard.c b/arch/arm/mach-rpc/ecard.c index 75cfad2cb143..b3d70389ac9a 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_blocklist { 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_blocklist __initdata blocklist[] = { { 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,13 +935,13 @@ 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); + for (i = 0; i < ARRAY_SIZE(blocklist); i++) + if (blocklist[i].manufacturer == ec->cid.manufacturer && + blocklist[i].product == ec->cid.product) { + if (blocklist[i].type) + ec->card_desc = blocklist[i].type; + if (blocklist[i].init) + blocklist[i].init(ec); break; }