[git patch] libata build fix

[git patch] libata build fix

[Jeff Garzik]

A merge mistake slipped upstream.

Please pull from 'upstream-linus' branch of
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-linus

to receive the following updates:

 drivers/ata/pata_jmicron.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

Jeff Garzik (1):
      [libata] pata_jmicron: build fix

diff --git a/drivers/ata/pata_jmicron.c b/drivers/ata/pata_jmicron.c
index 033319e..43763c9 100644
--- a/drivers/ata/pata_jmicron.c
+++ b/drivers/ata/pata_jmicron.c
@@ -244,7 +244,6 @@ static void __exit jmicron_exit(void)
 {
 	pci_unregister_driver(&jmicron_pci_driver);
 }
-#endif
 
 module_init(jmicron_init);
 module_exit(jmicron_exit);

[git patch] libata build fix

[Jeff Garzik]

And it becomes obvious I normally do my building and testing on x86-64...

Please pull from 'upstream-linus' branch of
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-linus

to receive the following updates:

 drivers/ata/pata_cs5536.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

Jeff Garzik (1):
      [libata] pata_cs5536: new API build fix

diff --git a/drivers/ata/pata_cs5536.c b/drivers/ata/pata_cs5536.c
index 21405bf..53070f6 100644
--- a/drivers/ata/pata_cs5536.c
+++ b/drivers/ata/pata_cs5536.c
@@ -239,7 +239,6 @@ static struct scsi_host_template cs5536_sht = {
 };
 
 static struct ata_port_operations cs5536_port_ops = {
-	.port_disable		= ata_port_disable,
 	.set_piomode		= cs5536_set_piomode,
 	.set_dmamode		= cs5536_set_dmamode,
 	.mode_filter		= ata_pci_default_filter,
@@ -269,7 +268,6 @@ static struct ata_port_operations cs5536_port_ops = {
 	.irq_handler		= ata_interrupt,
 	.irq_clear		= ata_bmdma_irq_clear,
 	.irq_on			= ata_irq_on,
-	.irq_ack		= ata_irq_ack,
 
 	.port_start		= ata_port_start,
 };

Re: [git patch] libata build fix

[Bartlomiej Zolnierkiewicz]

On Tuesday 16 October 2007, Jeff Garzik wrote:

> Jeff Garzik (1):
>       [libata] pata_cs5536: new API build fix

We probably need also this one for pata_cs5536:

[PATCH] pata_cs5536: MWDMA fix

* Fix out-of-bound array access for MWDMA modes.

* Bump driver version.

Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
 drivers/ata/pata_cs5536.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: b/drivers/ata/pata_cs5536.c
===================================================================
--- a/drivers/ata/pata_cs5536.c
+++ b/drivers/ata/pata_cs5536.c
@@ -40,7 +40,7 @@
 #include <asm/msr.h>
 
 #define DRV_NAME	"pata_cs5536"
-#define DRV_VERSION	"0.0.5"
+#define DRV_VERSION	"0.0.6"
 
 enum {
 	CFG			= 0,
@@ -214,7 +214,7 @@ static void cs5536_set_dmamode(struct at
 		cs5536_read(pdev, DTC, &dtc);
 
 		dtc &= ~(IDE_DRV_MASK << dshift);
-		dtc |= mwdma_timings[mode] << dshift;
+		dtc |= mwdma_timings[mode - XFER_MW_DMA_0] << dshift;
 
 		cs5536_write(pdev, DTC, dtc);
 	}

Re: [git patch] libata build fix

[Martin K. Petersen]

>>>>> "BZ" == Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> writes:

BZ> We probably need also this one for pata_cs5536:

BZ> [PATCH] pata_cs5536: MWDMA fix

BZ> * Fix out-of-bound array access for MWDMA modes.

BZ> * Bump driver version.

Obviously correct.  

Acked-by: Martin K. Petersen <martin.petersen@oracle.com>

-- 
Martin K. Petersen	Oracle Linux Engineering

Re: [git patch] libata build fix

[Jeff Garzik]

Bartlomiej Zolnierkiewicz wrote:
> On Tuesday 16 October 2007, Jeff Garzik wrote:
> 
>> Jeff Garzik (1):
>>       [libata] pata_cs5536: new API build fix
> 
> We probably need also this one for pata_cs5536:
> 
> [PATCH] pata_cs5536: MWDMA fix
> 
> * Fix out-of-bound array access for MWDMA modes.
> 
> * Bump driver version.
> 
> Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
> Cc: Jeff Garzik <jeff@garzik.org>
> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
> ---
>  drivers/ata/pata_cs5536.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 

applied