[TRIVIAL] [2.5 patch] remove an unused function from NCR53c406a.c

[TRIVIAL] [2.5 patch] remove an unused function from NCR53c406a.c

[Rusty Trivial Russell]

From:  Adrian Bunk <bunk@fs.tum.de>

  The patch below removes an unused function from 
  drivers/scsi/NCR53c406a.c .
   
  I've tested the compilation with 2.5.72-mm2.
   

--- trivial-2.5.74-bk4/drivers/scsi/NCR53c406a.c.orig	2003-07-07 17:36:33.000000000 +1000
+++ trivial-2.5.74-bk4/drivers/scsi/NCR53c406a.c	2003-07-07 17:36:33.000000000 +1000
@@ -170,7 +170,6 @@
 /* Static function prototypes */
 static void NCR53c406a_intr(int, void *, struct pt_regs *);
 static irqreturn_t do_NCR53c406a_intr(int, void *, struct pt_regs *);
-static void wait_intr(void);
 static void chip_init(void);
 static void calc_port_addr(void);
 #ifndef IRQ_LEV
@@ -664,26 +663,6 @@
 	return (info_msg);
 }
 
-static void wait_intr(void)
-{
-	unsigned long i = jiffies + WATCHDOG;
-
-	while (time_after(i, jiffies) && !(inb(STAT_REG) & 0xe0)) {	/* wait for a pseudo-interrupt */
-		cpu_relax();
-		barrier();
-	}
-
-	if (time_before_eq(i, jiffies)) {	/* Timed out */
-		rtrc(0);
-		current_SC->result = DID_TIME_OUT << 16;
-		current_SC->SCp.phase = idle;
-		current_SC->scsi_done(current_SC);
-		return;
-	}
-
-	NCR53c406a_intr(0, NULL, NULL);
-}
-
 static int NCR53c406a_queue(Scsi_Cmnd * SCpnt, void (*done) (Scsi_Cmnd *))
 {
 	int i;
-- 
  What is this? http://www.kernel.org/pub/linux/kernel/people/rusty/trivial/
  Don't blame me: the Monkey is driving
  File: Adrian Bunk <bunk@fs.tum.de>: [2.5 patch] remove an unused function from NCR53c406a.c

Re: [TRIVIAL] [2.5 patch] remove an unused function from NCR53c406a.c

[James Bottomley]

On Mon, 2003-07-07 at 02:46, Rusty Trivial Russell wrote:
> From:  Adrian Bunk <bunk@fs.tum.de>
> 
>   The patch below removes an unused function from 
>   drivers/scsi/NCR53c406a.c .
>    
>   I've tested the compilation with 2.5.72-mm2.

Rusty, I'm not going to remove this immediately.

It's the old polling interface for the chip.  It was unplumbed when the
->command() API was removed, but these chips were strangely connected to
soundblaster cards and may need to operate in no-interrupt mode (in
which case we'll need to ressurect it).  I'm just waiting to see if
anyone complains that their sound card attached CDROM no-longer works.

James

Re: [TRIVIAL] [2.5 patch] remove an unused function from NCR53c406a.c

[Alan Cox]

On Llu, 2003-07-07 at 14:56, James Bottomley wrote:
> It's the old polling interface for the chip.  It was unplumbed when the
> ->command() API was removed, but these chips were strangely connected to
> soundblaster cards and may need to operate in no-interrupt mode (in
> which case we'll need to ressurect it).  I'm just waiting to see if
> anyone complains that their sound card attached CDROM no-longer works.

Non interrupt mode doesn't seem to need ->command(). The queue function
just happens to return when the I/O completes.

Re: [TRIVIAL] [2.5 patch] remove an unused function from NCR53c406a.c

[Rusty Russell]

In message <1057586204.1812.2.camel@mulgrave> you write:
> On Mon, 2003-07-07 at 02:46, Rusty Trivial Russell wrote:
> > From:  Adrian Bunk <bunk@fs.tum.de>
> > 
> >   The patch below removes an unused function from 
> >   drivers/scsi/NCR53c406a.c .
> >    
> >   I've tested the compilation with 2.5.72-mm2.
> 
> Rusty, I'm not going to remove this immediately.
> 
> It's the old polling interface for the chip.  It was unplumbed when the
> ->command() API was removed, but these chips were strangely connected to
> soundblaster cards and may need to operate in no-interrupt mode (in
> which case we'll need to ressurect it).  I'm just waiting to see if
> anyone complains that their sound card attached CDROM no-longer works.

Thanks for taking the time to explain, James.  From the other patches
Adrian sent, I think he was on a warning hunt.

I'll turn off re-transmit on this patch, so if it gets applied later
Adrian will get a closure mail, otherwise I'll dredge it up again late
in the 2.6-pre stuff.

Thanks!
Rusty.
--
  Anyone who quotes me in their sig is an idiot. -- Rusty Russell.

Re: [TRIVIAL] [2.5 patch] remove an unused function from NCR53c406a.c

[Adrian Bunk]

On Tue, Jul 08, 2003 at 11:27:45AM +1000, Rusty Russell wrote:
> In message <1057586204.1812.2.camel@mulgrave> you write:
> > On Mon, 2003-07-07 at 02:46, Rusty Trivial Russell wrote:
> > > From:  Adrian Bunk <bunk@fs.tum.de>
> > > 
> > >   The patch below removes an unused function from 
> > >   drivers/scsi/NCR53c406a.c .
> > >    
> > >   I've tested the compilation with 2.5.72-mm2.
> > 
> > Rusty, I'm not going to remove this immediately.
> > 
> > It's the old polling interface for the chip.  It was unplumbed when the
> > ->command() API was removed, but these chips were strangely connected to
> > soundblaster cards and may need to operate in no-interrupt mode (in
> > which case we'll need to ressurect it).  I'm just waiting to see if
> > anyone complains that their sound card attached CDROM no-longer works.
> 
> Thanks for taking the time to explain, James.  From the other patches
> Adrian sent, I think he was on a warning hunt.

Yup, that's correct.

> I'll turn off re-transmit on this patch, so if it gets applied later
> Adrian will get a closure mail, otherwise I'll dredge it up again late
> in the 2.6-pre stuff.

That's OK for me.

> Thanks!
> Rusty.

Thanks
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed