The patch titled
pata: ide jmicron: Finish writing
has been removed from the -mm tree. Its filename is
pata-ide-jmicron-finish-writing.patch
This patch was dropped because an updated version was merged
------------------------------------------------------
Subject: pata: ide jmicron: Finish writing
From: Alan Cox <alan@xxxxxxxxxx>
Finish writing/compiling the IDE mode driver.
Signed-off-by: Alan Cox <alan@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/ide/pci/jmicron.c | 45 +++++++++++++-----------------------
1 file changed, 17 insertions(+), 28 deletions(-)
diff -puN drivers/ide/pci/jmicron.c~pata-ide-jmicron-finish-writing drivers/ide/pci/jmicron.c
--- a/drivers/ide/pci/jmicron.c~pata-ide-jmicron-finish-writing
+++ a/drivers/ide/pci/jmicron.c
@@ -16,11 +16,11 @@
#include <asm/io.h>
-enum port_type {
- PORT_PATA0 = 0;
- PORT_PATA1 = 1;
- PORT_SATA = 2;
-}
+typedef enum {
+ PORT_PATA0 = 0,
+ PORT_PATA1 = 1,
+ PORT_SATA = 2,
+} port_type;
/**
* jmicron_ratemask - Compute available modes
@@ -45,17 +45,18 @@ static u8 jmicron_ratemask(ide_drive_t *
* Return 1 if the cable is 80pin
*/
-static int ata66_jmicron(ide_hwif_t *hwif)
+static int __devinit ata66_jmicron(ide_hwif_t *hwif)
{
struct pci_dev *pdev = hwif->pci_dev;
u32 control;
u32 control5;
- int port_mask = 1<< (4 * hwif->channel);
int port = hwif->channel;
port_type port_map[2];
+ pci_read_config_dword(pdev, 0x40, &control);
+
/* There are two basic mappings. One has the two SATA ports merged
as master/slave and the secondary as PATA, the other has only the
SATA port mapped */
@@ -71,7 +72,7 @@ static int ata66_jmicron(ide_hwif_t *hwi
as the internal primary channel */
pci_read_config_dword(pdev, 0x80, &control5);
if (control5 & (1<<24))
- port_map[0] == PORT_PATA1;
+ port_map[0] = PORT_PATA1;
/* The two ports may then be logically swapped by the firmware */
if (control & (1 << 22))
@@ -87,14 +88,12 @@ static int ata66_jmicron(ide_hwif_t *hwi
case PORT_PATA0:
if (control & (1 << 3)) /* 40/80 pin primary */
return 1;
- else
- return 0;
- break;
+ return 0;
case PORT_PATA1:
if (control5 & (1 << 19)) /* 40/80 pin secondary */
return 0;
return 1;
- case PORT_SATA
+ case PORT_SATA:
return 1;
}
}
@@ -113,6 +112,7 @@ static void jmicron_tuneproc (ide_drive_
static void config_jmicron_chipset_for_pio (ide_drive_t *drive, byte set_speed)
{
+ u8 speed = XFER_PIO_0 + ide_get_best_pio_mode(drive, 255, 5, NULL);
if (set_speed)
(void) ide_config_drive_speed(drive, speed);
}
@@ -130,7 +130,6 @@ static void config_jmicron_chipset_for_p
static int jmicron_tune_chipset (ide_drive_t *drive, byte xferspeed)
{
- ide_hwif_t *hwif = drive->hwif;
u8 speed = ide_rate_filter(jmicron_ratemask(drive), xferspeed);
return ide_config_drive_speed(drive, speed);
@@ -174,16 +173,6 @@ static int jmicron_config_drive_for_dma
}
/**
- * ata66_jmicron - check for 80 pin cable
- * @hwif: interface to check
- *
- */
-
-static unsigned int __devinit ata66_jmicron(ide_hwif_t *hwif)
-{
-}
-
-/**
* init_hwif_jmicron - set up hwif structs
* @hwif: interface to set up
*
@@ -252,11 +241,11 @@ static int __devinit jmicron_init_one(st
}
static struct pci_device_id jmicron_pci_tbl[] = {
- { PCI_DEVICE(PCI_VENDOR_ID_JMICRO, PCI_DEVICE_ID_JMICRON_JMB361), 0},
- { PCI_DEVICE(PCI_VENDOR_ID_JMICRO, PCI_DEVICE_ID_JMICRON_JMB363), 1},
- { PCI_DEVICE(PCI_VENDOR_ID_JMICRO, PCI_DEVICE_ID_JMICRON_JMB365), 2},
- { PCI_DEVICE(PCI_VENDOR_ID_JMICRO, PCI_DEVICE_ID_JMICRON_JMB366), 3},
- { PCI_DEVICE(PCI_VENDOR_ID_JMICRO, PCI_DEVICE_ID_JMICRON_JMB368), 4},
+ { PCI_DEVICE(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB361), 0},
+ { PCI_DEVICE(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB363), 1},
+ { PCI_DEVICE(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB365), 2},
+ { PCI_DEVICE(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB366), 3},
+ { PCI_DEVICE(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB368), 4},
{ 0, },
};
_
Patches currently in -mm which might be from alan@xxxxxxxxxx are
git-libata-all.patch
pata-ata_generic-generic-bios-setup-sff-ata-driver.patch
pata-ide-jmicron-finish-writing.patch
pata-jmicron-it-works-better-if-you-get-the-file-name-right.patch
pata-jmicron-further-clean-up.patch
pata-ata_jmicro-fix-an-escapee.patch
pata-jmicron-jmicron-multifunction-setup.patch
pata-jmicron-missed-one.patch
pata-libata-enable-per-device-speed-setting.patch
fixes-for-piix-driver.patch
1-of-2-jmicron-driver.patch
2-of-2-jmicron-driver-plumbing-and-quirk.patch
my-name-is-ingo-molnar-you-killed-my-make-allyesconfig-prepare-to-die.patch
pata-jmicron-add-quirks-to-force-the-device-into-a-sane-mode.patch
pata-jmicron-configuration.patch
pata-jmicron-ide-old-type-driver.patch
sanitize-3c589_cs.patch
ide-backport-piix-fixes-from-libata-into-the-legacy-driver.patch
move-ide-to-unmaintained-drop-reference-to-old-git-tree.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
