Prev: [PATCH 23/68] ide: add drive->class field
Next: [PATCH 27/68] slc90e66: always program control bits
From: Bartlomiej Zolnierkiewicz on 29 Jan 2010 11:10
From: Bartlomiej Zolnierkiewicz <bzolnier(a)gmail.com>
Subject: [PATCH] sis5513: use pata_sis.h

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier(a)gmail.com>
---
drivers/ide/sis5513.c | 25 +++----------------------
1 file changed, 3 insertions(+), 22 deletions(-)

Index: b/drivers/ide/sis5513.c
===================================================================
--- a/drivers/ide/sis5513.c
+++ b/drivers/ide/sis5513.c
@@ -506,34 +506,15 @@ static int init_chipset_sis5513(struct p
return 0;
}

-struct sis_laptop {
- u16 device;
- u16 subvendor;
- u16 subdevice;
-};
-
-static const struct sis_laptop sis_laptop[] = {
- /* devid, subvendor, subdev */
- { 0x5513, 0x1043, 0x1107 }, /* ASUS A6K */
- { 0x5513, 0x1734, 0x105f }, /* FSC Amilo A1630 */
- { 0x5513, 0x1071, 0x8640 }, /* EasyNote K5305 */
- /* end marker */
- { 0, }
-};
+#include "../ata/pata_sis.h"

static u8 sis_cable_detect(ide_hwif_t *hwif)
{
struct pci_dev *pdev = to_pci_dev(hwif->dev);
- const struct sis_laptop *lap = &sis_laptop[0];
u8 ata66 = 0;

- while (lap->device) {
- if (lap->device == pdev->device &&
- lap->subvendor == pdev->subsystem_vendor &&
- lap->subdevice == pdev->subsystem_device)
- return ATA_CBL_PATA40_SHORT;
- lap++;
- }
+ if (sis_short_ata40(pdev))
+ return ATA_CBL_PATA40_SHORT;

if (chipset_family >= ATA_133) {
u16 regw = 0;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [PATCH 23/68] ide: add drive->class field
Next: [PATCH 27/68] slc90e66: always program control bits