From patchwork Mon Apr 8 19:52:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 787809 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 463F814601D for ; Mon, 8 Apr 2024 19:52:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712605978; cv=none; b=NDGhxGGlxk6FfzIHScOQ8UfFHLk+v5zjo0EHWpxffhSJZjE5AbKX+yrAbS7WsPNRex9eYkZt7Fb6i+W3oVqz9pcCURBKtzVUFB5iLf/K07u9DiJy4z7HZBTqt3S7Ll3eEBHH8ncTdREBGsVS21CPcwry06NAxAeFd5/guYOpQlg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712605978; c=relaxed/simple; bh=PzuSmE4ihUCh4/8IT4mYAJf9RDsenQewIMSnt0ppd44=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SnRVPnSWTc5E5UlvJJKBBjNIZEIGwqULIfM18WTpIAsqabZ0R2SLqig9G1ELAfJY/+e1/IgJY+IzDQjuXQ9LayprpC09hzRXSTUpV0AJg5q772HaZ9ZRgM3eQt1JEZxV0v7yXNAKViSivIYrVzdiolbPGoo56UUf6zKJCMnexJg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=GnioHYgv; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="GnioHYgv" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712605976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/mg7eMhdcCavZTvEVLK3/VeybeebfTGDbTPzbmCHQow=; b=GnioHYgvcE1HjE7U7pb/2lhgVuFGgKMk4dK9RP7HNAhLHRR9YA0w0k2xec21gzQMG5pzkG WZ+SH3qJdAR+pYfizDS4BYbhGeZi81kyjPkROaR2dl1BKMZ0i+k8zpfInOC5WNMlE3GvqE 0o/w8xZPcnFEfv9D/BeOg9gN5/g47n8= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-7-ZJBJWy0WM6W9OZFzlhiJ9g-1; Mon, 08 Apr 2024 15:52:52 -0400 X-MC-Unique: ZJBJWy0WM6W9OZFzlhiJ9g-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E54003C23FC2; Mon, 8 Apr 2024 19:52:51 +0000 (UTC) Received: from shalem.redhat.com (unknown [10.39.192.47]) by smtp.corp.redhat.com (Postfix) with ESMTP id 135931C060A6; Mon, 8 Apr 2024 19:52:50 +0000 (UTC) From: Hans de Goede To: Adrian Hunter , Ulf Hansson , Andy Shevchenko , Mika Westerberg Cc: Hans de Goede , linux-mmc@vger.kernel.org Subject: [PATCH v2 2/6] mmc: sdhci-acpi: Sort DMI quirks alphabetically Date: Mon, 8 Apr 2024 21:52:40 +0200 Message-ID: <20240408195244.248280-3-hdegoede@redhat.com> In-Reply-To: <20240408195244.248280-1-hdegoede@redhat.com> References: <20240408195244.248280-1-hdegoede@redhat.com> Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 Sort the DMI quirks alphabetically. Reviewed-by: Andy Shevchenko Signed-off-by: Hans de Goede --- drivers/mmc/host/sdhci-acpi.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c index acf5fc3ad7e4..d2003d3be6ba 100644 --- a/drivers/mmc/host/sdhci-acpi.c +++ b/drivers/mmc/host/sdhci-acpi.c @@ -719,7 +719,20 @@ static const struct acpi_device_id sdhci_acpi_ids[] = { }; 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 @@ -734,18 +747,6 @@ static const struct dmi_system_id sdhci_acpi_quirks[] = { }, .driver_data = (void *)DMI_QUIRK_RESET_SD_SIGNAL_VOLT_ON_SUSP, }, - { - /* - * 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