The patch titled
pata: jmicron: Further clean up
has been removed from the -mm tree. Its filename is
pata-jmicron-further-clean-up.patch
This patch was dropped because an updated version was merged
------------------------------------------------------
Subject: pata: jmicron: Further clean up
From: Alan Cox <alan@xxxxxxxxxx>
- Fix the comment that is bass ackwards in jmicron.c
- Switch ahci to use PCI_VENDOR_ID.. definitions
[PS: Jeff you'd tell me off for not using PCI_DEVICE_ID() here... ;)]
Signed-off-by: Alan Cox <alan@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/scsi/ahci.c | 10 +++++-----
drivers/scsi/ata_jmicron.c | 34 +++++++++++++++++-----------------
2 files changed, 22 insertions(+), 22 deletions(-)
diff -puN drivers/scsi/ahci.c~pata-jmicron-further-clean-up drivers/scsi/ahci.c
--- a/drivers/scsi/ahci.c~pata-jmicron-further-clean-up
+++ a/drivers/scsi/ahci.c
@@ -319,15 +319,15 @@ static const struct pci_device_id ahci_p
board_ahci }, /* ICH8M */
/* JMicron */
- { 0x197b, 0x2360, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ { PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB360, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
board_ahci }, /* JMicron JMB360 */
- { 0x197b, 0x2361, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ { PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB361, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
board_ahci }, /* JMicron JMB361 */
- { 0x197b, 0x2363, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ { PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB363, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
board_ahci }, /* JMicron JMB363 */
- { 0x197b, 0x2365, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ { PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB365, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
board_ahci }, /* JMicron JMB365 */
- { 0x197b, 0x2366, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ { PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB366, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
board_ahci }, /* JMicron JMB366 */
/* ATI */
diff -puN drivers/scsi/ata_jmicron.c~pata-jmicron-further-clean-up drivers/scsi/ata_jmicron.c
--- a/drivers/scsi/ata_jmicron.c~pata-jmicron-further-clean-up
+++ a/drivers/scsi/ata_jmicron.c
@@ -21,11 +21,11 @@
#define DRV_NAME "ata_jmicron"
#define DRV_VERSION "0.1"
-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_pre_reset - check for 40/80 pin
@@ -45,7 +45,6 @@ static int jmicron_pre_reset(struct ata_
u32 control;
u32 control5;
int port_mask = 1<< (4 * ap->hard_port_no);
- int is_sata = 0;
int port = ap->hard_port_no;
port_type port_map[2];
@@ -69,7 +68,7 @@ static int jmicron_pre_reset(struct ata_
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))
@@ -100,7 +99,7 @@ static int jmicron_pre_reset(struct ata_
ap->cbl = ATA_CBL_PATA80;
break;
case PORT_SATA:
- ap->cbl = ATA_CBL_SATA
+ ap->cbl = ATA_CBL_SATA;
break;
}
return ata_std_prereset(ap);
@@ -191,7 +190,7 @@ static const struct ata_port_operations
* Zero on success, or -ERRNO value.
*/
-static int jmicron_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
+static int jmicron_init_one (struct pci_dev *pdev, const struct pci_device_id *id)
{
static struct ata_port_info info = {
.sht = &jmicron_sht,
@@ -203,10 +202,11 @@ static int jmicron_init_one (struct pci_
.port_ops = &jmicron_ops,
};
+ struct ata_port_info *port_info[2] = { &info, &info };
u32 reg;
- if (id->device_data != 368) {
+ if (id->driver_data != 368) {
/* Put the controller into AHCI mode in case the AHCI driver
has not yet been loaded. This can be done with either
function present */
@@ -215,11 +215,11 @@ static int jmicron_init_one (struct pci_
pci_write_config_byte(pdev, 0x41, 0xa1);
}
- /* PATA controller is fn 0, AHCI is fn 1 */
+ /* PATA controller is fn 1, AHCI is fn 0 */
if (PCI_FUNC(pdev->devfn) != 1)
return -ENODEV;
- if ( id->device_data == 365 || id->device_data == 366) {
+ if ( id->driver_data == 365 || id->driver_data == 366) {
/* The 365/66 have two PATA channels, redirect the second */
pci_read_config_dword(pdev, 0x80, ®);
reg |= (1 << 24); /* IDE1 to PATA IDE secondary */
@@ -230,11 +230,11 @@ static int jmicron_init_one (struct pci_
}
static const struct pci_device_id jmicron_pci_tbl[] = {
- { PCI_DEVICE(PCI_VENDOR_ID_JMICRO, PCI_DEVICE_ID_JMICRON_JMB361), 361},
- { PCI_DEVICE(PCI_VENDOR_ID_JMICRO, PCI_DEVICE_ID_JMICRON_JMB363), 363},
- { PCI_DEVICE(PCI_VENDOR_ID_JMICRO, PCI_DEVICE_ID_JMICRON_JMB365), 365},
- { PCI_DEVICE(PCI_VENDOR_ID_JMICRO, PCI_DEVICE_ID_JMICRON_JMB366), 366},
- { PCI_DEVICE(PCI_VENDOR_ID_JMICRO, PCI_DEVICE_ID_JMICRON_JMB368), 368},
+ { PCI_DEVICE(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB361), 361},
+ { PCI_DEVICE(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB363), 363},
+ { PCI_DEVICE(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB365), 365},
+ { PCI_DEVICE(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB366), 366},
+ { PCI_DEVICE(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB368), 368},
{ } /* terminate list */
};
_
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-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
