cpqarray patches for 2.6 [3 of 5] RESEND
This is a resend of number 3. I think I munged up the first one. Sorry. Please apply patches in order.
-------------------------------------------------------------------------------
* cpqarray in kernel 2.6.1 seems to be based from 2.4.18 kernel with
specific 2.6.x stuff added.
* Defines io_mem_addr and io_mem_length to replace ioaddr (change from
2.4.18 to 2.4.19)
drivers/block/cpqarray.c | 6 +++--- drivers/block/cpqarray.h | 3 ++- drivers/block/smart1,2.h | 42 +++++++++++++++++++++--------------------- 3 files changed, 26 insertions(+), 25 deletions(-)
drivers/block/cpqarray.c renamed from drivers/block/cpqarray.c~cpqarray_io_mem +3 -3
@@ -224,7 +224,7 @@ static int ida_proc_get_info(char *buffe (unsigned long )h->board_id, h->firm_rev[0 ], h->firm_rev[1 ], h->firm_rev[2 ], h->firm_rev[3 ], (unsigned long )h->ctlr_sig, (unsigned long )h->vaddr, - (unsigned int ) h->ioaddr, (unsigned int )h->intr, + (unsigned int ) h->io_mem_addr, (unsigned int )h->intr, h->log_drives, h->phys_drives, h->Qdepth, h->maxQsinceinit);
@@ -570,7 +570,7 @@ DBGINFO( ); c->intr = irq; - c->ioaddr = addr[0 ]; + c->io_mem_addr = addr[0 ]; c->paddr =0 ;for (i=0 ; i<6 ; i++)
@@ -678,7 +678,7 @@ static int cpqarray_eisa_detect(void)continue ; }memset (hba[nr_ctlr],0 ,sizeof (ctlr_info_t)); - hba[nr_ctlr]->ioaddr = eisa[i]; + hba[nr_ctlr]->io_mem_addr = eisa[i];/* * Read the config register to find our interrupt
drivers/block/cpqarray.h renamed from drivers/block/cpqarray.h~cpqarray_io_mem +2 -1
@@ -92,7 +92,8 @@ struct ctlr_info {void *vaddr;unsigned long paddr; -unsigned long ioaddr; +unsigned long io_mem_addr; +unsigned long io_mem_length;int intr;int usage_count;drv_info_t drv[NWD ];
drivers/block/smart1,2.h renamed from drivers/block/smart1,2.h~cpqarray_io_mem +21 -21
98 lines not on this page · raw message
_