From patchwork Mon Jul 18 13:08:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prarit Bhargava X-Patchwork-Id: 105276 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 12880B6FD7 for ; Mon, 18 Jul 2011 23:17:57 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756903Ab1GRNQa (ORCPT ); Mon, 18 Jul 2011 09:16:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48025 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754182Ab1GRNJD (ORCPT ); Mon, 18 Jul 2011 09:09:03 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p6ID92g6009815 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 18 Jul 2011 09:09:03 -0400 Received: from localhost.localdomain (prarit.bos.redhat.com [10.16.16.23]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p6ID8nvL005963; Mon, 18 Jul 2011 09:09:02 -0400 From: Prarit Bhargava To: linux-kernel@vger.kernel.org Cc: Prarit Bhargava , linux-ide@vger.kernel.org Subject: [PATCH 13/34] drivers/ide changes for SMBIOS and System Firmware Date: Mon, 18 Jul 2011 09:08:27 -0400 Message-Id: <1310994528-26276-14-git-send-email-prarit@redhat.com> In-Reply-To: <1310994528-26276-1-git-send-email-prarit@redhat.com> References: <1310994528-26276-1-git-send-email-prarit@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org As part of the new SMBIOS and System Firmware code: - Replace old dmi* structures and functions with new sysfw* and smbios* structures and functions in individual drivers - cleanup sysfw_id lookup tables Cc: linux-ide@vger.kernel.org Signed-off-by: Prarit Bhargava --- drivers/ide/alim15x3.c | 18 +++++++++--------- drivers/ide/ide-acpi.c | 16 ++++++++-------- drivers/ide/ide-gd.c | 10 +++++----- drivers/ide/via82cxxx.c | 14 +++++++------- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c index 2c8016a..d5194e1 100644 --- a/drivers/ide/alim15x3.c +++ b/drivers/ide/alim15x3.c @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include @@ -333,22 +333,22 @@ out: * Cable special cases */ -static const struct dmi_system_id cable_dmi_table[] = { +static const struct sysfw_id cable_smbios_table[] = { { .ident = "HP Pavilion N5430", .matches = { - DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"), - DMI_MATCH(DMI_BOARD_VERSION, "OmniBook N32N-736"), + SYSFW_MATCH(SYSFW_BOARD_VENDOR, "Hewlett-Packard"), + SYSFW_MATCH(SYSFW_BOARD_VERSION, "OmniBook N32N-736"), }, }, { .ident = "Toshiba Satellite S1800-814", .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), - DMI_MATCH(DMI_PRODUCT_NAME, "S1800-814"), + SYSFW_MATCH(SYSFW_SYS_VENDOR, "TOSHIBA"), + SYSFW_MATCH(SYSFW_PRODUCT_NAME, "S1800-814"), }, }, - { } + {} }; static int ali_cable_override(struct pci_dev *pdev) @@ -363,8 +363,8 @@ static int ali_cable_override(struct pci_dev *pdev) pdev->subsystem_device == 0x8317) return 1; - /* Systems by DMI */ - if (dmi_check_system(cable_dmi_table)) + /* Systems by SMBIOS */ + if (sysfw_callback(cable_smbios_table)) return 1; return 0; diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c index 2af8cb4..dfcff27 100644 --- a/drivers/ide/ide-acpi.c +++ b/drivers/ide/ide-acpi.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include @@ -65,31 +65,31 @@ module_param_named(acpionboot, ide_acpionboot, bool, 0); MODULE_PARM_DESC(acpionboot, "call IDE ACPI methods on boot"); static bool ide_noacpi_psx; -static int no_acpi_psx(const struct dmi_system_id *id) +static int no_acpi_psx(const struct sysfw_id *id) { ide_noacpi_psx = true; printk(KERN_NOTICE"%s detected - disable ACPI _PSx.\n", id->ident); return 0; } -static const struct dmi_system_id ide_acpi_dmi_table[] = { +static const struct sysfw_id ide_acpi_smbios_table[] = { /* Bug 9673. */ /* We should check if this is because ACPI NVS isn't save/restored. */ { .callback = no_acpi_psx, .ident = "HP nx9005", .matches = { - DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies Ltd."), - DMI_MATCH(DMI_BIOS_VERSION, "KAM1.60") + SYSFW_MATCH(SYSFW_BIOS_VENDOR, + "Phoenix Technologies Ltd."), + SYSFW_MATCH(SYSFW_BIOS_VERSION, "KAM1.60") }, }, - - { } /* terminate list */ + {} }; int ide_acpi_init(void) { - dmi_check_system(ide_acpi_dmi_table); + sysfw_callback(ide_acpi_smbios_table); return 0; } diff --git a/drivers/ide/ide-gd.c b/drivers/ide/ide-gd.c index 70ea876..3801f49 100644 --- a/drivers/ide/ide-gd.c +++ b/drivers/ide/ide-gd.c @@ -7,8 +7,8 @@ #include #include #include -#include #include +#include #if !defined(CONFIG_DEBUG_BLOCK_EXT_DEVT) #define IDE_DISK_MINORS (1 << PARTN_BITS) @@ -102,13 +102,13 @@ static void ide_gd_resume(ide_drive_t *drive) (void)drive->disk_ops->get_capacity(drive); } -static const struct dmi_system_id ide_coldreboot_table[] = { +static const struct sysfw_id ide_coldreboot_table[] = { { /* Acer TravelMate 66x cuts power during reboot */ .ident = "Acer TravelMate 660", .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Acer"), - DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 660"), + SYSFW_MATCH(SYSFW_SYS_VENDOR, "Acer"), + SYSFW_MATCH(SYSFW_PRODUCT_NAME, "TravelMate 660"), }, }, @@ -132,7 +132,7 @@ static void ide_gd_shutdown(ide_drive_t *drive) if (system_state != SYSTEM_POWER_OFF) { #else if (system_state == SYSTEM_RESTART && - !dmi_check_system(ide_coldreboot_table)) { + !sysfw_callback(ide_coldreboot_table)) { #endif drive->disk_ops->flush(drive); return; diff --git a/drivers/ide/via82cxxx.c b/drivers/ide/via82cxxx.c index f46f49c..a51eb2b 100644 --- a/drivers/ide/via82cxxx.c +++ b/drivers/ide/via82cxxx.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #ifdef CONFIG_PPC_CHRP #include @@ -354,21 +354,21 @@ static int init_chipset_via82cxxx(struct pci_dev *dev) * Cable special cases */ -static const struct dmi_system_id cable_dmi_table[] = { +static const struct sysfw_id cable_smbios_table[] = { { .ident = "Acer Ferrari 3400", .matches = { - DMI_MATCH(DMI_BOARD_VENDOR, "Acer,Inc."), - DMI_MATCH(DMI_BOARD_NAME, "Ferrari 3400"), + SYSFW_MATCH(SYSFW_BOARD_VENDOR, "Acer,Inc."), + SYSFW_MATCH(SYSFW_BOARD_NAME, "Ferrari 3400"), }, }, - { } + {} }; static int via_cable_override(struct pci_dev *pdev) { - /* Systems by DMI */ - if (dmi_check_system(cable_dmi_table)) + /* Systems by SMBIOS */ + if (sysfw_callback(cable_smbios_table)) return 1; /* Arima W730-K8/Targa Visionary 811/... */