From patchwork Tue Jul 14 08:31:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Schulz X-Patchwork-Id: 11661941 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 02B336C1 for ; Tue, 14 Jul 2020 08:31:46 +0000 (UTC) Received: by mail.kernel.org (Postfix) id F0C3C21BE5; Tue, 14 Jul 2020 08:31:45 +0000 (UTC) Delivered-To: soc@kernel.org Received: from mail-vs1-f68.google.com (mail-vs1-f68.google.com [209.85.217.68]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A795C21D93 for ; Tue, 14 Jul 2020 08:31:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=mawsonlakes-org.20150623.gappssmtp.com header.i=@mawsonlakes-org.20150623.gappssmtp.com header.b="YX0V4hn1" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A795C21D93 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=mawsonlakes.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=pschulz01@gmail.com Received: by mail-vs1-f68.google.com with SMTP id k7so8114436vso.2 for ; Tue, 14 Jul 2020 01:31:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mawsonlakes-org.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to:cc; bh=I34lWY3Mvfgs+kKK9IlVYobKggUVEWqnHr1IEHCsmwM=; b=YX0V4hn1k7PLlXpoQEi6dyBAiBRXJqe7UnUtugrTYpC/d8auo7rdTT2YPmuRxDSsxl N3Z9s8ZIuSirVJ3UFyY9GdgYLf5sY4aMS0cUKQV/S1KRs19BjO1wYE2kfX4v7qFf1UIC pD0RdwubjA8oWk7dGYt/y3ouqQce8uvvdwWVkKPfvRvniyaWymSFLJVfFMMueJEprxr/ vZfGiz+F5njf3h3MkO5BbL2vs3qRzNxK12cTTmaduEUJN5TZaz+UTxu3FfE7xsNCXdFA 61lNPkN501WHQxlg+dyYBKkQ6i8pLjH3B2FpZTsQXEc8/3huNVtiCIFm5l9VaXdmXutR 7V8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc; bh=I34lWY3Mvfgs+kKK9IlVYobKggUVEWqnHr1IEHCsmwM=; b=ajYt4ztm0KDA200HsAjIyK4ElbiKdmuAn96E5e501dKJKbD/dEFKhtSPrm3tufaNbg dhJfmzBplQxYu06YNQ4TAkPTd5CM0uL5vJqstnZkRcNOyvPmj1E40MRUWXAAvt1CVl2s bPIcSBPMzeicLf81fDWlPTmLRWR8ajdbwrtLfgOuwcyDJYx7W9axFi/mkck9trObcgly K/UER8veXWlNjCmC3TMcV4erL5yGXlz6/gKFEyTXZ6OlwJKjWFzDOIT/IQudLqaHo9+Y b46EFQjvj1rs+vOw8iEMOd9ZEo6WbP/PMFoZ4d/OqnulerONSCYU5j9kUOCecEw8FQbB NwJQ== X-Gm-Message-State: AOAM531iMeR7HG7I+ooQZSCvELMOxuSs89Moxr+ct3hOq2rZvr+S2M+F mhs22Zfj0IfCaIl/TAnvDmLxlhrTB18TmcKIDQi0rCEjClc= X-Google-Smtp-Source: ABdhPJyLwVFDGrO87GVePDksHcsCYa/jhI+pqM3dkebDjR5bwWT9uuNl+Cajbzhmq82lB4RSlZuWgocTjjYSwDkMxus= X-Received: by 2002:a67:d086:: with SMTP id s6mr2469200vsi.130.1594715504642; Tue, 14 Jul 2020 01:31:44 -0700 (PDT) MIME-Version: 1.0 From: Paul Schulz Date: Tue, 14 Jul 2020 18:01:33 +0930 Message-ID: Subject: Subject: [PATCH] arm: Changes 'blacklist' to 'blocklist' in ecode.c file To: linux-arm-kernel@lists.infradead.org List-Id: Cc: Russell King , soc@kernel.org From: Paul Schulz Changes 'blacklist' to 'blocklist' in ecode.c file This is a functionally trivial patch which removes the word 'blacklist' from this arm code. It has no other effect. Signed-off-by: Paul Schulz --- arch/arm/mach-rpc/ecard.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/mach-rpc/ecard.c b/arch/arm/mach-rpc/ecard.c index 75cfad2cb143..f63a97b44f89 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 }, }; @@ -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; }