From c9f991b36d82941ffa8caf2dc24f14eb7cfc3f4b Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Thu, 10 Aug 2006 18:13:18 +0900
Subject: [PATCH] --- yaml --- r: 35390 b: refs/heads/master c:
 b7887196e38da54ff893897b80875d632d1a1114 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/scsi/ahci.c         | 2 +-
 trunk/drivers/scsi/ata_piix.c     | 4 ++--
 trunk/drivers/scsi/pdc_adma.c     | 5 ++---
 trunk/drivers/scsi/sata_mv.c      | 2 +-
 trunk/drivers/scsi/sata_nv.c      | 2 +-
 trunk/drivers/scsi/sata_promise.c | 2 +-
 trunk/drivers/scsi/sata_qstor.c   | 2 +-
 trunk/drivers/scsi/sata_sil.c     | 6 +++++-
 trunk/drivers/scsi/sata_sil24.c   | 2 +-
 trunk/drivers/scsi/sata_sis.c     | 2 +-
 trunk/drivers/scsi/sata_svw.c     | 2 +-
 trunk/drivers/scsi/sata_sx4.c     | 2 +-
 trunk/drivers/scsi/sata_uli.c     | 2 +-
 trunk/drivers/scsi/sata_via.c     | 2 +-
 trunk/drivers/scsi/sata_vsc.c     | 2 +-
 trunk/include/linux/ata.h         | 2 --
 trunk/include/linux/libata.h      | 2 ++
 18 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/[refs] b/[refs]
index 7517169c2bfc..1b50f705c598 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a2e42ad0f7ac0f4093b96ed0c6744f09bdfce1d
+refs/heads/master: b7887196e38da54ff893897b80875d632d1a1114
diff --git a/trunk/drivers/scsi/ahci.c b/trunk/drivers/scsi/ahci.c
index 68fd7667a082..813031c01fba 100644
--- a/trunk/drivers/scsi/ahci.c
+++ b/trunk/drivers/scsi/ahci.c
@@ -1665,7 +1665,7 @@ static void ahci_remove_one (struct pci_dev *pdev)
 
 static int __init ahci_init(void)
 {
-	return pci_module_init(&ahci_pci_driver);
+	return pci_register_driver(&ahci_pci_driver);
 }
 
 static void __exit ahci_exit(void)
diff --git a/trunk/drivers/scsi/ata_piix.c b/trunk/drivers/scsi/ata_piix.c
index 501755a606ed..46c34fd5af8f 100644
--- a/trunk/drivers/scsi/ata_piix.c
+++ b/trunk/drivers/scsi/ata_piix.c
@@ -939,8 +939,8 @@ static int __init piix_init(void)
 {
 	int rc;
 
-	DPRINTK("pci_module_init\n");
-	rc = pci_module_init(&piix_pci_driver);
+	DPRINTK("pci_register_driver\n");
+	rc = pci_register_driver(&piix_pci_driver);
 	if (rc)
 		return rc;
 
diff --git a/trunk/drivers/scsi/pdc_adma.c b/trunk/drivers/scsi/pdc_adma.c
index efc8fff1d250..6b7b62408e44 100644
--- a/trunk/drivers/scsi/pdc_adma.c
+++ b/trunk/drivers/scsi/pdc_adma.c
@@ -183,8 +183,7 @@ static struct ata_port_info adma_port_info[] = {
 	{
 		.sht		= &adma_ata_sht,
 		.host_flags	= ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST |
-				  ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO |
-				  ATA_FLAG_PIO_POLLING,
+				  ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO,
 		.pio_mask	= 0x10, /* pio4 */
 		.udma_mask	= 0x1f, /* udma0-4 */
 		.port_ops	= &adma_ata_ops,
@@ -722,7 +721,7 @@ static int adma_ata_init_one(struct pci_dev *pdev,
 
 static int __init adma_ata_init(void)
 {
-	return pci_module_init(&adma_ata_pci_driver);
+	return pci_register_driver(&adma_ata_pci_driver);
 }
 
 static void __exit adma_ata_exit(void)
diff --git a/trunk/drivers/scsi/sata_mv.c b/trunk/drivers/scsi/sata_mv.c
index 1053c7c76b7d..a2915a56accd 100644
--- a/trunk/drivers/scsi/sata_mv.c
+++ b/trunk/drivers/scsi/sata_mv.c
@@ -2447,7 +2447,7 @@ static int mv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
 static int __init mv_init(void)
 {
-	return pci_module_init(&mv_pci_driver);
+	return pci_register_driver(&mv_pci_driver);
 }
 
 static void __exit mv_exit(void)
diff --git a/trunk/drivers/scsi/sata_nv.c b/trunk/drivers/scsi/sata_nv.c
index 56da25581f31..be46df75ab5a 100644
--- a/trunk/drivers/scsi/sata_nv.c
+++ b/trunk/drivers/scsi/sata_nv.c
@@ -583,7 +583,7 @@ static void nv_ck804_host_stop(struct ata_host_set *host_set)
 
 static int __init nv_init(void)
 {
-	return pci_module_init(&nv_pci_driver);
+	return pci_register_driver(&nv_pci_driver);
 }
 
 static void __exit nv_exit(void)
diff --git a/trunk/drivers/scsi/sata_promise.c b/trunk/drivers/scsi/sata_promise.c
index 4776f4e55839..a5b3a7db7a9f 100644
--- a/trunk/drivers/scsi/sata_promise.c
+++ b/trunk/drivers/scsi/sata_promise.c
@@ -824,7 +824,7 @@ static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *e
 
 static int __init pdc_ata_init(void)
 {
-	return pci_module_init(&pdc_ata_pci_driver);
+	return pci_register_driver(&pdc_ata_pci_driver);
 }
 
 
diff --git a/trunk/drivers/scsi/sata_qstor.c b/trunk/drivers/scsi/sata_qstor.c
index d374c1db0cf3..71bd6712b377 100644
--- a/trunk/drivers/scsi/sata_qstor.c
+++ b/trunk/drivers/scsi/sata_qstor.c
@@ -712,7 +712,7 @@ static int qs_ata_init_one(struct pci_dev *pdev,
 
 static int __init qs_ata_init(void)
 {
-	return pci_module_init(&qs_ata_pci_driver);
+	return pci_register_driver(&qs_ata_pci_driver);
 }
 
 static void __exit qs_ata_exit(void)
diff --git a/trunk/drivers/scsi/sata_sil.c b/trunk/drivers/scsi/sata_sil.c
index f4e262b06cf2..2393379b2398 100644
--- a/trunk/drivers/scsi/sata_sil.c
+++ b/trunk/drivers/scsi/sata_sil.c
@@ -141,8 +141,12 @@ static const struct sil_drivelist {
 	{ "ST330013AS",		SIL_QUIRK_MOD15WRITE },
 	{ "ST340017AS",		SIL_QUIRK_MOD15WRITE },
 	{ "ST360015AS",		SIL_QUIRK_MOD15WRITE },
+	{ "ST380013AS",		SIL_QUIRK_MOD15WRITE },
 	{ "ST380023AS",		SIL_QUIRK_MOD15WRITE },
 	{ "ST3120023AS",	SIL_QUIRK_MOD15WRITE },
+	{ "ST3160023AS",	SIL_QUIRK_MOD15WRITE },
+	{ "ST3120026AS",	SIL_QUIRK_MOD15WRITE },
+	{ "ST3200822AS",	SIL_QUIRK_MOD15WRITE },
 	{ "ST340014ASL",	SIL_QUIRK_MOD15WRITE },
 	{ "ST360014ASL",	SIL_QUIRK_MOD15WRITE },
 	{ "ST380011ASL",	SIL_QUIRK_MOD15WRITE },
@@ -710,7 +714,7 @@ static int sil_pci_device_resume(struct pci_dev *pdev)
 
 static int __init sil_init(void)
 {
-	return pci_module_init(&sil_pci_driver);
+	return pci_register_driver(&sil_pci_driver);
 }
 
 static void __exit sil_exit(void)
diff --git a/trunk/drivers/scsi/sata_sil24.c b/trunk/drivers/scsi/sata_sil24.c
index 3f368c7d3ef9..3a0161ddc33f 100644
--- a/trunk/drivers/scsi/sata_sil24.c
+++ b/trunk/drivers/scsi/sata_sil24.c
@@ -1205,7 +1205,7 @@ static int sil24_pci_device_resume(struct pci_dev *pdev)
 
 static int __init sil24_init(void)
 {
-	return pci_module_init(&sil24_pci_driver);
+	return pci_register_driver(&sil24_pci_driver);
 }
 
 static void __exit sil24_exit(void)
diff --git a/trunk/drivers/scsi/sata_sis.c b/trunk/drivers/scsi/sata_sis.c
index ee6b5df41d30..ac24f66897f6 100644
--- a/trunk/drivers/scsi/sata_sis.c
+++ b/trunk/drivers/scsi/sata_sis.c
@@ -334,7 +334,7 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 
 static int __init sis_init(void)
 {
-	return pci_module_init(&sis_pci_driver);
+	return pci_register_driver(&sis_pci_driver);
 }
 
 static void __exit sis_exit(void)
diff --git a/trunk/drivers/scsi/sata_svw.c b/trunk/drivers/scsi/sata_svw.c
index 7d0858095e1f..baf259a966d0 100644
--- a/trunk/drivers/scsi/sata_svw.c
+++ b/trunk/drivers/scsi/sata_svw.c
@@ -488,7 +488,7 @@ static struct pci_driver k2_sata_pci_driver = {
 
 static int __init k2_sata_init(void)
 {
-	return pci_module_init(&k2_sata_pci_driver);
+	return pci_register_driver(&k2_sata_pci_driver);
 }
 
 
diff --git a/trunk/drivers/scsi/sata_sx4.c b/trunk/drivers/scsi/sata_sx4.c
index ccc8cad24f7d..0da83cba5c12 100644
--- a/trunk/drivers/scsi/sata_sx4.c
+++ b/trunk/drivers/scsi/sata_sx4.c
@@ -1482,7 +1482,7 @@ static int pdc_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *
 
 static int __init pdc_sata_init(void)
 {
-	return pci_module_init(&pdc_sata_pci_driver);
+	return pci_register_driver(&pdc_sata_pci_driver);
 }
 
 
diff --git a/trunk/drivers/scsi/sata_uli.c b/trunk/drivers/scsi/sata_uli.c
index 33cdb4867ef1..654aae2b25c5 100644
--- a/trunk/drivers/scsi/sata_uli.c
+++ b/trunk/drivers/scsi/sata_uli.c
@@ -287,7 +287,7 @@ static int uli_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 
 static int __init uli_init(void)
 {
-	return pci_module_init(&uli_pci_driver);
+	return pci_register_driver(&uli_pci_driver);
 }
 
 static void __exit uli_exit(void)
diff --git a/trunk/drivers/scsi/sata_via.c b/trunk/drivers/scsi/sata_via.c
index 03baec2191bf..0bf1dbea6406 100644
--- a/trunk/drivers/scsi/sata_via.c
+++ b/trunk/drivers/scsi/sata_via.c
@@ -381,7 +381,7 @@ static int svia_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 
 static int __init svia_init(void)
 {
-	return pci_module_init(&svia_pci_driver);
+	return pci_register_driver(&svia_pci_driver);
 }
 
 static void __exit svia_exit(void)
diff --git a/trunk/drivers/scsi/sata_vsc.c b/trunk/drivers/scsi/sata_vsc.c
index ad37871594f5..4c69a705a483 100644
--- a/trunk/drivers/scsi/sata_vsc.c
+++ b/trunk/drivers/scsi/sata_vsc.c
@@ -462,7 +462,7 @@ static struct pci_driver vsc_sata_pci_driver = {
 
 static int __init vsc_sata_init(void)
 {
-	return pci_module_init(&vsc_sata_pci_driver);
+	return pci_register_driver(&vsc_sata_pci_driver);
 }
 
 
diff --git a/trunk/include/linux/ata.h b/trunk/include/linux/ata.h
index 8d708a3d505b..3671af869696 100644
--- a/trunk/include/linux/ata.h
+++ b/trunk/include/linux/ata.h
@@ -40,8 +40,6 @@ enum {
 	ATA_MAX_DEVICES		= 2,	/* per bus/port */
 	ATA_MAX_PRD		= 256,	/* we could make these 256/256 */
 	ATA_SECT_SIZE		= 512,
-	ATA_MAX_SECTORS		= 256,
-	ATA_MAX_SECTORS_LBA48	= 65535,/* TODO: 65536? */
 
 	ATA_ID_WORDS		= 256,
 	ATA_ID_SERNO_OFS	= 10,
diff --git a/trunk/include/linux/libata.h b/trunk/include/linux/libata.h
index 060da736b3a8..ed749f778697 100644
--- a/trunk/include/linux/libata.h
+++ b/trunk/include/linux/libata.h
@@ -114,6 +114,8 @@ enum {
 	/* tag ATA_MAX_QUEUE - 1 is reserved for internal commands */
 	ATA_MAX_QUEUE		= 32,
 	ATA_TAG_INTERNAL	= ATA_MAX_QUEUE - 1,
+	ATA_MAX_SECTORS		= 200,	/* FIXME */
+	ATA_MAX_SECTORS_LBA48	= 65535,
 	ATA_MAX_BUS		= 2,
 	ATA_DEF_BUSY_WAIT	= 10000,
 	ATA_SHORT_PAUSE		= (HZ >> 6) + 1,