From: Lucas De Marchi <lucas.demarchi@intel.com>
To: x86@kernel.org
Cc: "Dave Hansen" <dave.hansen@linux.intel.com>,
"Ingo Molnar" <mingo@redhat.com>,
"Thomas Gleixner" <tglx@linutronix.de>,
"Bjorn Helgaas" <bhelgaas@google.com>,
linux-pci@vger.kernel.org, intel-gfx@lists.freedesktop.org,
"Ville Syrjälä" <ville.syrjala@linux.intel.com>,
"Matt Roper" <matthew.d.roper@intel.com>,
"Rodrigo Vivi" <rodrigo.vivi@intel.com>
Subject: [PATCH v5 5/5] x86/quirks: Improve line wrap on quirk conditions
Date: Thu, 13 Jan 2022 16:28:43 -0800 [thread overview]
Message-ID: <20220114002843.2083382-5-lucas.demarchi@intel.com> (raw)
In-Reply-To: <20220114002843.2083382-1-lucas.demarchi@intel.com>
Remove extra parenthesis and wrap lines so it's easier to read what are
the conditions being checked. The call to the hook also had an extra
indentation: remove here to conform to coding style.
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
arch/x86/kernel/early-quirks.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index 1db4d92f8a85..996e3cbc1c5f 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -769,14 +769,12 @@ static int __init check_dev_quirk(int num, int slot, int func)
device = read_pci_config_16(num, slot, func, PCI_DEVICE_ID);
for (i = 0; early_qrk[i].f != NULL; i++) {
- if (((early_qrk[i].vendor == PCI_ANY_ID) ||
- (early_qrk[i].vendor == vendor)) &&
- ((early_qrk[i].device == PCI_ANY_ID) ||
- (early_qrk[i].device == device)) &&
- (!((early_qrk[i].class ^ class) &
- early_qrk[i].class_mask)))
- early_qrk[i].f(num, slot, func);
-
+ if ((early_qrk[i].vendor == PCI_ANY_ID ||
+ early_qrk[i].vendor == vendor) &&
+ (early_qrk[i].device == PCI_ANY_ID ||
+ early_qrk[i].device == device) &&
+ !((early_qrk[i].class ^ class) & early_qrk[i].class_mask))
+ early_qrk[i].f(num, slot, func);
}
type = read_pci_config_byte(num, slot, func,
--
2.34.1
next prev parent reply other threads:[~2022-01-14 0:28 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-14 0:28 [PATCH v5 1/5] x86/quirks: Fix stolen detection with integrated + discrete GPU Lucas De Marchi
2022-01-14 0:28 ` [PATCH v5 2/5] x86/quirks: Stop using QFLAG_APPLY_ONCE in via_bugs() Lucas De Marchi
2022-01-14 0:28 ` [PATCH v5 3/5] x86/quirks: Stop using QFLAG_APPLY_ONCE in nvidia_bugs() Lucas De Marchi
2022-01-14 0:28 ` [PATCH v5 4/5] x86/quirks: Remove unused logic for flags Lucas De Marchi
2022-01-14 0:28 ` Lucas De Marchi [this message]
2022-01-18 9:40 ` [PATCH v5 1/5] x86/quirks: Fix stolen detection with integrated + discrete GPU Borislav Petkov
2022-01-18 16:36 ` Lucas De Marchi
2022-01-18 17:26 ` Borislav Petkov
2022-01-18 17:58 ` [Intel-gfx] " Bjorn Helgaas
2022-01-18 18:37 ` Borislav Petkov
2022-01-18 20:01 ` Bjorn Helgaas
2022-01-18 20:31 ` Borislav Petkov
2022-01-19 20:30 ` Lucas De Marchi
2022-01-19 20:58 ` Bjorn Helgaas
2022-01-18 19:05 ` Lucas De Marchi
2022-01-18 19:14 ` Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220114002843.2083382-5-lucas.demarchi@intel.com \
--to=lucas.demarchi@intel.com \
--cc=bhelgaas@google.com \
--cc=dave.hansen@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-pci@vger.kernel.org \
--cc=matthew.d.roper@intel.com \
--cc=mingo@redhat.com \
--cc=rodrigo.vivi@intel.com \
--cc=tglx@linutronix.de \
--cc=ville.syrjala@linux.intel.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).