[PATCH] Changes blacklist to blocklist in ecode.c file
paul at mawsonlakes.org
paul at mawsonlakes.org
Tue Jul 14 10:05:57 EDT 2020
From: Paul Schulz <paul at mawsonlakes.org>
---
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;
}
--
2.25.1
More information about the linux-arm-kernel
mailing list