diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2009-06-23 21:04:37 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2009-06-23 21:04:37 +0000 |
| commit | ec03ced5fa6eb25eee164839268b538abb965e99 (patch) | |
| tree | 6d3382662fa3ad4119d3a3cda223c53949ca4894 /target/linux/coldfire/patches/042-m5445x_pata_24_cleanup.patch | |
| parent | 777de3a39c4b92ad53b2b9363f405d0c4c28847a (diff) | |
| download | upstream-ec03ced5fa6eb25eee164839268b538abb965e99.tar.gz upstream-ec03ced5fa6eb25eee164839268b538abb965e99.tar.bz2 upstream-ec03ced5fa6eb25eee164839268b538abb965e99.zip | |
use broken-out patches for the coldfire to make it easier to follow differences against the bsp
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16547 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/coldfire/patches/042-m5445x_pata_24_cleanup.patch')
| -rw-r--r-- | target/linux/coldfire/patches/042-m5445x_pata_24_cleanup.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/target/linux/coldfire/patches/042-m5445x_pata_24_cleanup.patch b/target/linux/coldfire/patches/042-m5445x_pata_24_cleanup.patch new file mode 100644 index 0000000000..0229987781 --- /dev/null +++ b/target/linux/coldfire/patches/042-m5445x_pata_24_cleanup.patch @@ -0,0 +1,49 @@ +From 329eae71bdbe9e30f76164ba3dd5ef0dba932eef Mon Sep 17 00:00:00 2001 +From: Kurt Mahan <kmahan@freescale.com> +Date: Fri, 15 Feb 2008 15:34:58 -0700 +Subject: [PATCH] Remove .port_disable and .irq_ack for 2.6.24. + +LTIBName: m5445x-pata-24-cleanup +Signed-off-by: Kurt Mahan <kmahan@freescale.com> +--- + drivers/ata/pata_fsl.c | 15 --------------- + 1 files changed, 0 insertions(+), 15 deletions(-) + +--- a/drivers/ata/pata_fsl.c ++++ b/drivers/ata/pata_fsl.c +@@ -497,19 +497,6 @@ err_out: + } + #endif /* CONFIG_FSL_PATA_USE_DMA */ + +-static u8 pata_fsl_irq_ack(struct ata_port *ap, unsigned int chk_drq) +-{ +- unsigned int bits = chk_drq ? ATA_BUSY | ATA_DRQ : ATA_BUSY; +- u8 status; +- +- status = ata_busy_wait(ap, bits, 1000); +- if (status & bits) +- if (ata_msg_err(ap)) +- printk(KERN_ERR "abnormal status 0x%X\n", status); +- +- return status; +-} +- + static void ata_dummy_noret(struct ata_port *ap) { return; } + + static struct scsi_host_template pata_fsl_sht = { +@@ -538,7 +525,6 @@ static struct ata_port_operations pata_f + .set_dmamode = pata_fsl_set_dmamode, + #endif + +- .port_disable = ata_port_disable, + .tf_load = ata_tf_load, + .tf_read = ata_tf_read, + .check_status = ata_check_status, +@@ -563,7 +549,6 @@ static struct ata_port_operations pata_f + + .irq_clear = ata_dummy_noret, + .irq_on = ata_irq_on, +- .irq_ack = pata_fsl_irq_ack, + + .port_start = pata_fsl_port_start, + |