[patch 3/3] scsi: wd33c93 needs <asm/irq.h>

[patch 3/3] scsi: wd33c93 needs <asm/irq.h>

[Geert Uytterhoeven]

[-- Attachment #1: m68k-wd33c93-needs-asm-irq.diff --]
[-- Type: text/plain, Size: 1014 bytes --]

wd33c93 SCSI needs <asm/irq.h> on m68k

drivers/scsi/wd33c93.c: In function 'wd33c93_host_reset':
drivers/scsi/wd33c93.c:1582: error: implicit declaration of function 'disable_irq'
drivers/scsi/wd33c93.c:1603: error: implicit declaration of function 'enable_irq'

The driver still compiles on MIPS (CONFIG_SGIWD93_SCSI=y)

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
 drivers/scsi/wd33c93.c |    2 ++
 1 file changed, 2 insertions(+)

--- a/drivers/scsi/wd33c93.c
+++ b/drivers/scsi/wd33c93.c
@@ -89,6 +89,8 @@
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
 
+#include <asm/irq.h>
+
 #include "wd33c93.h"
 
 #define optimum_sx_per(hostdata) (hostdata)->sx_table[1].period_ns

-- 
Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Re: [patch 3/3] scsi: wd33c93 needs <asm/irq.h>

[James Bottomley]

On Fri, 2007-07-20 at 18:40 +0200, Geert Uytterhoeven wrote:
> plain text document attachment (m68k-wd33c93-needs-asm-irq.diff)
> wd33c93 SCSI needs <asm/irq.h> on m68k
> 
> drivers/scsi/wd33c93.c: In function 'wd33c93_host_reset':
> drivers/scsi/wd33c93.c:1582: error: implicit declaration of function 'disable_irq'
> drivers/scsi/wd33c93.c:1603: error: implicit declaration of function 'enable_irq'
> 
> The driver still compiles on MIPS (CONFIG_SGIWD93_SCSI=y)

That's fixed here, isn't it:

http://git.kernel.org/?p=linux/kernel/git/jejb/scsi-misc-2.6.git;a=commit;h=078dda95c521b1c78d1b5da69ac90d581abc9951

(sorry about the lack of descriptive subject line)

James

Re: [patch 3/3] scsi: wd33c93 needs <asm/irq.h>

[Geert Uytterhoeven]

On Fri, 20 Jul 2007, James Bottomley wrote:
> On Fri, 2007-07-20 at 18:40 +0200, Geert Uytterhoeven wrote:
> > plain text document attachment (m68k-wd33c93-needs-asm-irq.diff)
> > wd33c93 SCSI needs <asm/irq.h> on m68k
> > 
> > drivers/scsi/wd33c93.c: In function 'wd33c93_host_reset':
> > drivers/scsi/wd33c93.c:1582: error: implicit declaration of function 'disable_irq'
> > drivers/scsi/wd33c93.c:1603: error: implicit declaration of function 'enable_irq'
> > 
> > The driver still compiles on MIPS (CONFIG_SGIWD93_SCSI=y)
> 
> That's fixed here, isn't it:
> 
> http://git.kernel.org/?p=linux/kernel/git/jejb/scsi-misc-2.6.git;a=commit;h=078dda95c521b1c78d1b5da69ac90d581abc9951

Indeed, thx!

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Re: [patch 3/3] scsi: wd33c93 needs <asm/irq.h>

[Adrian Bunk]

On Fri, Jul 20, 2007 at 11:48:57AM -0500, James Bottomley wrote:
> On Fri, 2007-07-20 at 18:40 +0200, Geert Uytterhoeven wrote:
> > plain text document attachment (m68k-wd33c93-needs-asm-irq.diff)
> > wd33c93 SCSI needs <asm/irq.h> on m68k
> > 
> > drivers/scsi/wd33c93.c: In function 'wd33c93_host_reset':
> > drivers/scsi/wd33c93.c:1582: error: implicit declaration of function 'disable_irq'
> > drivers/scsi/wd33c93.c:1603: error: implicit declaration of function 'enable_irq'
> > 
> > The driver still compiles on MIPS (CONFIG_SGIWD93_SCSI=y)
> 
> That's fixed here, isn't it:
> 
> http://git.kernel.org/?p=linux/kernel/git/jejb/scsi-misc-2.6.git;a=commit;h=078dda95c521b1c78d1b5da69ac90d581abc9951
> 
> (sorry about the lack of descriptive subject line)

It wasn't a compile error when I sent this patch to you for the first 
time 11 months ago...

> James

cu
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

Re: [patch 3/3] scsi: wd33c93 needs <asm/irq.h>

[Ralf Baechle]

On Fri, Jul 20, 2007 at 06:40:46PM +0200, Geert Uytterhoeven wrote:

> --- a/drivers/scsi/wd33c93.c
> +++ b/drivers/scsi/wd33c93.c
> @@ -89,6 +89,8 @@
>  #include <scsi/scsi_device.h>
>  #include <scsi/scsi_host.h>
>  
> +#include <asm/irq.h>

These days that should probably be <linux/irq.h>.

  Ralf

Re: [patch 3/3] scsi: wd33c93 needs <asm/irq.h>

[Christoph Hellwig]

On Fri, Jul 20, 2007 at 06:31:32PM +0100, Ralf Baechle wrote:
> > +#include <asm/irq.h>
> 
> These days that should probably be <linux/irq.h>.

Not at all, linux/irq.h is something entirely different.

Re: [patch 3/3] scsi: wd33c93 needs <asm/irq.h>

[Matthew Wilcox]

On Fri, Jul 20, 2007 at 06:31:32PM +0100, Ralf Baechle wrote:
> On Fri, Jul 20, 2007 at 06:40:46PM +0200, Geert Uytterhoeven wrote:
> > +#include <asm/irq.h>
> 
> These days that should probably be <linux/irq.h>.

Go and read the comments at the top of linux/irq.h.
And then report to Russell for your whipping.

-- 
"Bill, look, we understand that you're interested in selling us this
operating system, but compare it to ours.  We can't possibly take such
a retrograde step."

Re: [patch 3/3] scsi: wd33c93 needs <asm/irq.h>

[Sergei Shtylyov]

Hello Christoph:

>>>+#include <asm/irq.h>

>>These days that should probably be <linux/irq.h>.

> Not at all, linux/irq.h is something entirely different.

    Actually, <linux/interrupt.h>

WBR, Sergei

Re: [patch 3/3] scsi: wd33c93 needs <asm/irq.h>

[Ralf Baechle]

On Fri, Jul 20, 2007 at 06:33:59PM +0100, Christoph Hellwig wrote:

> On Fri, Jul 20, 2007 at 06:31:32PM +0100, Ralf Baechle wrote:
> > > +#include <asm/irq.h>
> > 
> > These days that should probably be <linux/irq.h>.
> 
> Not at all, linux/irq.h is something entirely different.

Well, fine.  But checkpatch.pl will bitch about this and other files.
So one way or the other it's not quite kosher.

  Ralf

Re: [patch 3/3] scsi: wd33c93 needs <asm/irq.h>

[Matthew Wilcox]

On Fri, Jul 20, 2007 at 09:43:47PM +0400, Sergei Shtylyov wrote:
> Hello Christoph:
> 
> >>>+#include <asm/irq.h>
> 
> >>These days that should probably be <linux/irq.h>.
> 
> >Not at all, linux/irq.h is something entirely different.
> 
>    Actually, <linux/interrupt.h>

Not for enable/disable_irq.  For request_irq, yes.

This is something that should be fixed.

-- 
"Bill, look, we understand that you're interested in selling us this
operating system, but compare it to ours.  We can't possibly take such
a retrograde step."

Re: [patch 3/3] scsi: wd33c93 needs <asm/irq.h>

[Al Viro]

On Fri, Jul 20, 2007 at 11:50:50AM -0600, Matthew Wilcox wrote:
> On Fri, Jul 20, 2007 at 09:43:47PM +0400, Sergei Shtylyov wrote:
> > Hello Christoph:
> > 
> > >>>+#include <asm/irq.h>
> > 
> > >>These days that should probably be <linux/irq.h>.
> > 
> > >Not at all, linux/irq.h is something entirely different.
> > 
> >    Actually, <linux/interrupt.h>
> 
> Not for enable/disable_irq.  For request_irq, yes.
> 
> This is something that should be fixed.

Now it is...  FWIW, I suspect that absolute majority of asm/irq.h
uses can be removed now.

Next steps in irq.h/interrupt.h cleanups:
	* scouring asm/irq.h like it had been done for sparc32;
the parts that are only used by relevant arch/ code should be
taken there and includes _in_ asm/irq.h trimmed to minimum
	* separating tasklet.h, with interrupt.h still including it.
Using it where needed.
	* asm/softirq.h (with stuff mostly taken there from asm/hardirq.h)
and linux/softirq.h; again interrupt.h still should include it.
	* mechanical adding include of linux/interrupt.h to files that use
request_irq/free_irq/enable_irq/disable_irq/irqreturn_t/IRQF_...
---> in the next merge window:
	* replace include of linux/interrupt.h in netdevice.h with
that of linux/softirq.h.
	* trim uses of linux/interrupt.h that are not needed anymore.