From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bartlomiej Zolnierkiewicz Subject: [PATCH 16/68] pata_via: move short cable handling to pata_via.h Date: Fri, 29 Jan 2010 17:04:53 +0100 Message-ID: <20100129160453.21495.30904.sendpatchset@localhost> References: <20100129160308.21495.14120.sendpatchset@localhost> Return-path: Received: from fg-out-1718.google.com ([72.14.220.154]:45357 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751059Ab0A2QFa (ORCPT ); Fri, 29 Jan 2010 11:05:30 -0500 In-Reply-To: <20100129160308.21495.14120.sendpatchset@localhost> Sender: linux-ide-owner@vger.kernel.org List-Id: linux-ide@vger.kernel.org To: linux-ide@vger.kernel.org Cc: Bartlomiej Zolnierkiewicz , linux-kernel@vger.kernel.org From: Bartlomiej Zolnierkiewicz Subject: [PATCH] pata_via: move short cable handling to pata_via.h It is a generic code and can be shared between pata_via & via82cxxx drivers. Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/ata/pata_via.c | 28 +--------------------------- drivers/ata/pata_via.h | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 27 deletions(-) Index: b/drivers/ata/pata_via.c =================================================================== --- a/drivers/ata/pata_via.c +++ b/drivers/ata/pata_via.c @@ -60,7 +60,6 @@ #include #include #include -#include #define DRV_NAME "pata_via" #define DRV_VERSION "0.3.4" @@ -127,32 +126,7 @@ struct via_port { u8 cached_device; }; -/* - * Cable special cases - */ - -static const struct dmi_system_id cable_dmi_table[] = { - { - .ident = "Acer Ferrari 3400", - .matches = { - DMI_MATCH(DMI_BOARD_VENDOR, "Acer,Inc."), - DMI_MATCH(DMI_BOARD_NAME, "Ferrari 3400"), - }, - }, - { } -}; - -static int via_cable_override(struct pci_dev *pdev) -{ - /* Systems by DMI */ - if (dmi_check_system(cable_dmi_table)) - return 1; - /* Arima W730-K8/Targa Visionary 811/... */ - if (pdev->subsystem_vendor == 0x161F && pdev->subsystem_device == 0x2032) - return 1; - return 0; -} - +#include "pata_via.h" /** * via_cable_detect - cable detection Index: b/drivers/ata/pata_via.h =================================================================== --- /dev/null +++ b/drivers/ata/pata_via.h @@ -0,0 +1,29 @@ + +#include + +/* + * Cable special cases + */ + +static const struct dmi_system_id cable_dmi_table[] = { + { + .ident = "Acer Ferrari 3400", + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "Acer,Inc."), + DMI_MATCH(DMI_BOARD_NAME, "Ferrari 3400"), + }, + }, + { } +}; + +static int via_cable_override(struct pci_dev *pdev) +{ + /* Systems by DMI */ + if (dmi_check_system(cable_dmi_table)) + return 1; + /* Arima W730-K8/Targa Visionary 811/... */ + if (pdev->subsystem_vendor == 0x161F && + pdev->subsystem_device == 0x2032) + return 1; + return 0; +}