From: Bjorn Helgaas <bjorn.helgaas@hp.com>
To: linux-ia64@vger.kernel.org
Subject: Re: 2.6.5-rc2 lots of warnings for dma_error
Date: Mon, 22 Mar 2004 18:32:59 +0000 [thread overview]
Message-ID: <200403221133.00006.bjorn.helgaas@hp.com> (raw)
In-Reply-To: <5631.1079924674@kao2.melbourne.sgi.com>
On Monday 22 March 2004 2:36 am, Andrew Morton wrote:
> This adds the necessary stubs for ia64 and builds OK with my config, but it
> needs a double-check.
In addition, I needed the following patch to build the ide-cd driver
because the ia64 generic target makes "dma_error" a #define.
diff -u -ur 2.6-mm/drivers/ide/ide-cd.c 2.6/drivers/ide/ide-cd.c
--- 2.6-mm/drivers/ide/ide-cd.c 2004-03-22 11:26:42.000000000 -0700
+++ 2.6/drivers/ide/ide-cd.c 2004-03-22 10:17:00.000000000 -0700
@@ -1044,7 +1044,7 @@
int ireason, len, sectors_to_transfer, nskip;
struct cdrom_info *info = drive->driver_data;
u8 lowcyl = 0, highcyl = 0;
- int dma = info->dma, dma_error = 0;
+ int dma = info->dma, dma_err = 0;
struct request *rq = HWGROUP(drive)->rq;
@@ -1053,7 +1053,7 @@
*/
if (dma) {
info->dma = 0;
- if ((dma_error = HWIF(drive)->ide_dma_end(drive)))
+ if ((dma_err = HWIF(drive)->ide_dma_end(drive)))
__ide_dma_off(drive);
}
@@ -1061,7 +1061,7 @@
return ide_stopped;
if (dma) {
- if (!dma_error) {
+ if (!dma_err) {
ide_end_request(drive, 1, rq->nr_sectors);
return ide_stopped;
} else
@@ -1645,17 +1645,17 @@
{
struct cdrom_info *info = drive->driver_data;
struct request *rq = HWGROUP(drive)->rq;
- int dma_error, dma, stat, ireason, len, thislen;
+ int dma_err, dma, stat, ireason, len, thislen;
u8 lowcyl, highcyl;
xfer_func_t *xferfunc;
unsigned long flags;
/* Check for errors. */
- dma_error = 0;
+ dma_err = 0;
dma = info->dma;
if (dma) {
info->dma = 0;
- dma_error = HWIF(drive)->ide_dma_end(drive);
+ dma_err = HWIF(drive)->ide_dma_end(drive);
}
if (cdrom_decode_status(drive, 0, &stat)) {
@@ -1671,7 +1671,7 @@
* using dma, transfer is complete now
*/
if (dma) {
- if (dma_error) {
+ if (dma_err) {
printk("ide-cd: dma error\n");
__ide_dma_off(drive);
return DRIVER(drive)->error(drive, "dma error", stat);
@@ -1790,7 +1790,7 @@
{
int stat, ireason, len, sectors_to_transfer, uptodate;
struct cdrom_info *info = drive->driver_data;
- int dma_error = 0, dma = info->dma;
+ int dma_err = 0, dma = info->dma;
u8 lowcyl = 0, highcyl = 0;
struct request *rq = HWGROUP(drive)->rq;
@@ -1798,7 +1798,7 @@
/* Check for errors. */
if (dma) {
info->dma = 0;
- if ((dma_error = HWIF(drive)->ide_dma_end(drive))) {
+ if ((dma_err = HWIF(drive)->ide_dma_end(drive))) {
printk("ide-cd: write dma error\n");
__ide_dma_off(drive);
}
@@ -1811,7 +1811,7 @@
* using dma, transfer is complete now
*/
if (dma) {
- if (dma_error)
+ if (dma_err)
return DRIVER(drive)->error(drive, "dma error", stat);
ide_end_request(drive, 1, rq->nr_sectors);
next prev parent reply other threads:[~2004-03-22 18:32 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-03-22 3:04 2.6.5-rc2 lots of warnings for dma_error Keith Owens
2004-03-22 9:36 ` Andrew Morton
2004-03-22 18:30 ` Bjorn Helgaas
2004-03-22 18:32 ` Bjorn Helgaas [this message]
2004-03-22 18:40 ` Alex Williamson
2004-03-22 18:56 ` Jens Axboe
2004-03-22 19:02 ` Bjorn Helgaas
2004-03-22 20:21 ` Andrew Morton
2004-03-22 21:37 ` Bjorn Helgaas
2004-03-22 21:58 ` Andrew Morton
2004-03-22 22:23 ` Bjorn Helgaas
2004-03-22 22:35 ` Andrew Morton
2004-03-22 22:55 ` Bjorn Helgaas
2004-03-23 7:04 ` Jens Axboe
2004-03-23 18:00 ` David Mosberger
2004-03-23 18:08 ` Andrew Morton
2004-03-23 18:16 ` Andrew Morton
2004-03-23 18:17 ` Andrew Morton
2004-03-24 1:49 ` Anton Blanchard
2004-03-24 18:29 ` Bjorn Helgaas
2004-03-24 18:38 ` David Mosberger
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=200403221133.00006.bjorn.helgaas@hp.com \
--to=bjorn.helgaas@hp.com \
--cc=linux-ia64@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