arm: Changes blacklist to quirklist in ecode.c file

Commit Message

Paul Schulz July 15, 2020, 2:47 a.m. UTC

From: Paul Schulz <[e-mail]>

(second attempt)

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 <[e-mail]>
---
 arch/arm/mach-rpc/ecard.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

Comments

Arnd Bergmann July 17, 2020, 2:18 p.m. UTC | #1

I have applied this to the arm/soc branch of the soc tree now, but added
a few changes in the process. Please adapt your process in the future
so this is not necessary. Changes include:

- Subject line changed to "ARM: rpc: Change blacklist to quirklist in
ecode.c file"
   to adapt to the local style. Please check for each patch how the subsystem
   name is normally written.

On Wed, Jul 15, 2020 at 4:48 AM <[e-mail]> wrote:
>
> From: Paul Schulz <[e-mail]>

This line was likely added by 'git send-email' because you did not
configure your cleartext name correctly and the sender email
address only contains "[e-mail]" but not your
actual name. If the sender and the patch author are the same, the
line will get skipped.

> (second attempt)

The email text goes into the permanent git history, so it should not
contain this line. What you should do instead is:

- in the Subject line, use "[PATCH v2]" to indicate the version of the
  patch or patch series. "git format-patch" can add this autmatically
  using the --v parameter, and 'git am' drops it when I pick up the
  patch later.

- Below the '---' line of the email, you can give additional information
  that is relevant for the reviewer but not for the git history. This part
  also gets dropped by 'git am'.

       Arnd

Patch

diff --git a/arch/arm/mach-rpc/ecard.c b/arch/arm/mach-rpc/ecard.c
index 75cfad2cb143..8b1ac2114e8b 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 quirklist[] __initdata = {
 	{ MANU_ACORN, PROD_ACORN_ETHER1, "Acorn Ether1" },
 	{ MANU_ATOMWIDE, PROD_ATOMWIDE_3PSERIAL, NULL, atomwide_3p_quirk },
 };
@@ -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(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;
 		}