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: 11662959 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 C8870138C for ; Tue, 14 Jul 2020 14:11:26 +0000 (UTC) Received: by mail.kernel.org (Postfix) id C234F22513; Tue, 14 Jul 2020 14:11:26 +0000 (UTC) Delivered-To: soc@kernel.org Received: from ipmail03.adl2.internode.on.net (ipmail03.adl2.internode.on.net [150.101.137.141]) by mail.kernel.org (Postfix) with ESMTP id 3E7F422510 for ; Tue, 14 Jul 2020 14:11:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3E7F422510 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=mawsonlakes.org Authentication-Results: mail.kernel.org; spf=fail smtp.mailfrom=paul@mawsonlakes.org 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 List-Id: Cc: arnd@arndb.de, soc@kernel.org, Paul Schulz 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 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; }