From: Paul Mackerras <paulus@au1.ibm.com>
To: dalecki@evision-ventures.com
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] fix ide-pmac.c compile errors
Date: Fri, 28 Jun 2002 10:42:45 -0400 (EDT) [thread overview]
Message-ID: <15644.30181.956053.553768@argo.ozlabs.ibm.com> (raw)
Martin,
The following patch fixes some compile errors in ide-pmac.c. Please
apply.
Paul.
diff -urN linux-2.5/drivers/ide/ide-pmac.c pmac-2.5/drivers/ide/ide-pmac.c
--- linux-2.5/drivers/ide/ide-pmac.c Fri Jun 28 10:35:07 2002
+++ pmac-2.5/drivers/ide/ide-pmac.c Tue Jun 25 15:06:34 2002
@@ -256,7 +256,7 @@
static void pmac_ide_setup_dma(struct device_node *np, int ix);
static void pmac_udma_enable(struct ata_device *drive, int on, int verbose);
-static int pmac_udma_start(struct ata_device *drive, struct request *rq);
+static void pmac_udma_start(struct ata_device *drive, struct request *rq);
static int pmac_udma_stop(struct ata_device *drive);
static int pmac_udma_init(struct ata_device *drive, struct request *rq);
static int pmac_udma_irq_status(struct ata_device *drive);
@@ -1340,7 +1340,7 @@
ide_toggle_bounce(drive, 0);
}
-static int pmac_udma_start(struct ata_device *drive, struct request *rq)
+static void pmac_udma_start(struct ata_device *drive, struct request *rq)
{
int ix, ata4;
volatile struct dbdma_regs *dma;
@@ -1350,7 +1350,7 @@
*/
ix = pmac_ide_find(drive);
if (ix < 0)
- return ide_stopped;
+ return;
dma = pmac_ide[ix].dma_regs;
ata4 = (pmac_ide[ix].kind == controller_kl_ata4 ||
@@ -1359,8 +1359,6 @@
out_le32(&dma->control, (RUN << 16) | RUN);
/* Make sure it gets to the controller right now */
(void)in_le32(&dma->control);
-
- return ide_started;
}
static int pmac_udma_stop(struct ata_device *drive)
@@ -1490,10 +1488,10 @@
* active bit is still set */
set_bit(IDE_DMA, drive->channel->active);
// if (drive->waiting_for_dma >= DMA_WAIT_TIMEOUT) {
-// printk(KERN_WARNING "ide%d, timeout waiting \
- for dbdma command stop\n", ix);
- return 1;
- }
+// printk(KERN_WARNING "ide%d, timeout waiting "
+// "for dbdma command stop\n", ix);
+// return 1;
+// }
udelay(1);
return 0;
}
reply other threads:[~2002-06-28 14:40 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=15644.30181.956053.553768@argo.ozlabs.ibm.com \
--to=paulus@au1.ibm.com \
--cc=dalecki@evision-ventures.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®