* Re: 2.4.36 - trm290
2002-09-20 21:02 2.4.36 - trm290 Pawel Bernadowski
@ 2002-09-23 10:49 ` Jens Axboe
0 siblings, 0 replies; 2+ messages in thread
From: Jens Axboe @ 2002-09-23 10:49 UTC (permalink / raw)
To: Pawel Bernadowski; +Cc: linux-kernel
On Fri, Sep 20 2002, Pawel Bernadowski wrote:
> i didn`t compile 2.5.36(& 37).. error :
>
> gcc -Wp,-MD,./.trm290.o.d -D__KERNEL__
> -I/home/users/builder/rpm/BUILD/linux-2.5.37/include -Wall
> -Wstrict-prototypes -Wno-trigraphs -O2
> -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe
> -mpreferred-stack-boundary=2 -march=i686
> -I/home/users/builder/rpm/BUILD/linux-2.5.37/arch/i386/mach-generic
> -nostdinc -iwithprefix include -I../ -DKBUILD_BASENAME=trm290 -c -o
> trm290.o
> trm290.c
> trm290.c: In function `trm290_ide_dma_write':
> trm290.c:195: too many arguments to function `ide_build_dmatable'
> trm290.c: In function `trm290_ide_dma_read':
> trm290.c:239: too many arguments to function `ide_build_dmatable'
> make[3]: *** [trm290.o] Error 1
Might fix this differently later, but this should make it work for now.
The reason for the error is that 2.4.20-pre-ac has the extra argument to
indicate data direction, however this isn't needed on 2.5 since the
request has a data direction bit.
# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.603 -> 1.604
# drivers/ide/pci/trm290.c 1.5 -> 1.6
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/09/23 axboe@burns.home.kernel.dk 1.604
# Bad merge from 2.4.20-pre-ac, ide_build_dmatable() does not need data
# direction argument in 2.5 (it's implicit in the request)
# --------------------------------------------
#
diff -Nru a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c
--- a/drivers/ide/pci/trm290.c Mon Sep 23 12:48:51 2002
+++ b/drivers/ide/pci/trm290.c Mon Sep 23 12:48:51 2002
@@ -192,7 +192,7 @@
trm290_prepare_drive(drive, 0); /* select PIO xfer */
return 1;
#endif
- if (!(count = ide_build_dmatable(drive, rq, PCI_DMA_TODEVICE))) {
+ if (!(count = ide_build_dmatable(drive, rq))) {
/* try PIO instead of DMA */
trm290_prepare_drive(drive, 0); /* select PIO xfer */
return 1;
@@ -236,7 +236,7 @@
task_ioreg_t command = WIN_NOP;
unsigned int count, reading = 2, writing = 0;
- if (!(count = ide_build_dmatable(drive, rq, PCI_DMA_FROMDEVICE))) {
+ if (!(count = ide_build_dmatable(drive, rq))) {
/* try PIO instead of DMA */
trm290_prepare_drive(drive, 0); /* select PIO xfer */
return 1;
--
Jens Axboe
^ permalink raw reply [flat|nested] 2+ messages in thread