From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A368081ABF; Thu, 13 Jun 2024 12:07:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718280426; cv=none; b=A/Z9J/F97EMco0qcMpXDi+onPoINwSVHKwg9SVD7QdzQpDTLJqU2KMxCRnLet2vO+yOI1w/tc3PDjH9tZcfBFSv3joA4MO85X0DtcHRkRsVdCNqLTYL7hpD4PLIvOpjvocTUnQRMVo6r8RUy1LQmP0XdA1pJ6rSuytu8ovSoSwo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718280426; c=relaxed/simple; bh=qTLfSg0jDESWYx9eS+84Y6d1z3RKkoTe3ld8xIQvC4c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cCOzsVJvf7o4QlOltBKSmXjmSEcx1RaEpqa1Uz306XFPfz93pV9eX1jv/+bnZUjLKKMjByAn+i5pnDxIiaOo/VMz6+XBnNUAw8JRuRQ1RbqPZsoowX0/ymvpaDzoU1AP4jp8ZV1xX5vw2joXX8H5EJ5yW9dJ5lh9XH8gigwt++Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=sNgJ9jGf; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="sNgJ9jGf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2CE39C2BBFC; Thu, 13 Jun 2024 12:07:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1718280426; bh=qTLfSg0jDESWYx9eS+84Y6d1z3RKkoTe3ld8xIQvC4c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sNgJ9jGfYP1hbJHWc4kjz6pNVbnbTgEQtWJh1N5KLZlF2N/Twucq7kupJi9I8T9Zp Ni/O7fU1ZzR+zO5YcNKkvRPW5N//HDGPUF2jT2K5fHkAl/NkrWVzAq/4g5/Juf5atK DYYbS+/hTX6OlUfUGSsBQFwlSEBmzexZSHIW9wiI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Andy Shevchenko , Hans de Goede , Adrian Hunter , Ulf Hansson Subject: [PATCH 6.6 050/137] mmc: sdhci-acpi: Sort DMI quirks alphabetically Date: Thu, 13 Jun 2024 13:33:50 +0200 Message-ID: <20240613113225.234127982@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240613113223.281378087@linuxfoundation.org> References: <20240613113223.281378087@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Hans de Goede commit a92a73b1d9249d155412d8ac237142fa716803ea upstream. Sort the DMI quirks alphabetically. Reviewed-by: Andy Shevchenko Signed-off-by: Hans de Goede Acked-by: Adrian Hunter Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20240410191639.526324-4-hdegoede@redhat.com Signed-off-by: Ulf Hansson Signed-off-by: Greg Kroah-Hartman --- drivers/mmc/host/sdhci-acpi.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) --- a/drivers/mmc/host/sdhci-acpi.c +++ b/drivers/mmc/host/sdhci-acpi.c @@ -719,9 +719,22 @@ static const struct acpi_device_id sdhci }; MODULE_DEVICE_TABLE(acpi, sdhci_acpi_ids); +/* Please keep this list sorted alphabetically */ static const struct dmi_system_id sdhci_acpi_quirks[] = { { /* + * The Acer Aspire Switch 10 (SW5-012) microSD slot always + * reports the card being write-protected even though microSD + * cards do not have a write-protect switch at all. + */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Acer"), + DMI_MATCH(DMI_PRODUCT_NAME, "Aspire SW5-012"), + }, + .driver_data = (void *)DMI_QUIRK_SD_NO_WRITE_PROTECT, + }, + { + /* * The Lenovo Miix 320-10ICR has a bug in the _PS0 method of * the SHC1 ACPI device, this bug causes it to reprogram the * wrong LDO (DLDO3) to 1.8V if 1.8V modes are used and the @@ -736,18 +749,6 @@ static const struct dmi_system_id sdhci_ }, { /* - * The Acer Aspire Switch 10 (SW5-012) microSD slot always - * reports the card being write-protected even though microSD - * cards do not have a write-protect switch at all. - */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Acer"), - DMI_MATCH(DMI_PRODUCT_NAME, "Aspire SW5-012"), - }, - .driver_data = (void *)DMI_QUIRK_SD_NO_WRITE_PROTECT, - }, - { - /* * The Toshiba WT8-B's microSD slot always reports the card being * write-protected. */