aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAhmed S. Darwish <darwish.07@gmail.com>2007-10-17 02:30:20 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 11:43:00 -0400
commit38d090b080a2df56a196c0ee89f6237f0fa47fdf (patch)
tree9ee6c9c16efefb5ac03c912cc91cc306e5fdbb8a
parent96fdc72ddfe8aa3eb1f51e78cc13babefbf26dda (diff)
NCR53C8XX: Remove deprecated IRQ flags (SA_*)
Stop using deprecated IRQ flags in ncr53c8xx documentaion. The new IRQF_* macros are used instead. Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com> Cc: James Bottomley <James.Bottomley@steeleye.com> Cc: Matthew Wilcox <willy@debian.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--Documentation/scsi/ChangeLog.ncr53c8xx6
-rw-r--r--Documentation/scsi/ncr53c8xx.txt14
2 files changed, 10 insertions, 10 deletions
diff --git a/Documentation/scsi/ChangeLog.ncr53c8xx b/Documentation/scsi/ChangeLog.ncr53c8xx
index 7d03e9d5b5f7..a9f721aeb11c 100644
--- a/Documentation/scsi/ChangeLog.ncr53c8xx
+++ b/Documentation/scsi/ChangeLog.ncr53c8xx
@@ -195,9 +195,9 @@ Sun Feb 14:00 1999 Gerard Roudier (groudier@club-internet.fr)
195 Pointed out by Leonard Zubkoff. 195 Pointed out by Leonard Zubkoff.
196 - Allow to tune request_irq() flags from the boot command line using 196 - Allow to tune request_irq() flags from the boot command line using
197 ncr53c8xx=irqm:??, as follows: 197 ncr53c8xx=irqm:??, as follows:
198 a) If bit 0x10 is set in irqm, SA_SHIRQ flag is not used. 198 a) If bit 0x10 is set in irqm, IRQF_SHARED flag is not used.
199 b) If bit 0x20 is set in irqm, SA_INTERRUPT flag is not used. 199 b) If bit 0x20 is set in irqm, IRQF_DISABLED flag is not used.
200 By default the driver uses both SA_SHIRQ and SA_INTERRUPT. 200 By default the driver uses both IRQF_SHARED and IRQF_DISABLED.
201 Option 'ncr53c8xx=irqm:0x20' may be used when an IRQ is shared by 201 Option 'ncr53c8xx=irqm:0x20' may be used when an IRQ is shared by
202 a 53C8XX adapter and a network board. 202 a 53C8XX adapter and a network board.
203 - Tiny mispelling fixed (ABORT instead of ABRT). Was fortunately 203 - Tiny mispelling fixed (ABORT instead of ABRT). Was fortunately
diff --git a/Documentation/scsi/ncr53c8xx.txt b/Documentation/scsi/ncr53c8xx.txt
index 39d409a8efe5..230e30846ef2 100644
--- a/Documentation/scsi/ncr53c8xx.txt
+++ b/Documentation/scsi/ncr53c8xx.txt
@@ -785,8 +785,8 @@ port address 0x1400.
785 irqm:0 always open drain 785 irqm:0 always open drain
786 irqm:1 same as initial settings (assumed BIOS settings) 786 irqm:1 same as initial settings (assumed BIOS settings)
787 irqm:2 always totem pole 787 irqm:2 always totem pole
788 irqm:0x10 driver will not use SA_SHIRQ flag when requesting irq 788 irqm:0x10 driver will not use IRQF_SHARED flag when requesting irq
789 irqm:0x20 driver will not use SA_INTERRUPT flag when requesting irq 789 irqm:0x20 driver will not use IRQF_DISABLED flag when requesting irq
790 790
791 (Bits 0x10 and 0x20 can be combined with hardware irq mode option) 791 (Bits 0x10 and 0x20 can be combined with hardware irq mode option)
792 792
@@ -1236,15 +1236,15 @@ when the SCSI DATA IN phase is reentered after a phase mismatch.
1236When an IRQ is shared by devices that are handled by different drivers, it 1236When an IRQ is shared by devices that are handled by different drivers, it
1237may happen that one driver complains about the request of the IRQ having 1237may happen that one driver complains about the request of the IRQ having
1238failed. Inder Linux-2.0, this may be due to one driver having requested the 1238failed. Inder Linux-2.0, this may be due to one driver having requested the
1239IRQ using the SA_INTERRUPT flag but some other having requested the same IRQ 1239IRQ using the IRQF_DISABLED flag but some other having requested the same IRQ
1240without this flag. Under both Linux-2.0 and linux-2.2, this may be caused by 1240without this flag. Under both Linux-2.0 and linux-2.2, this may be caused by
1241one driver not having requested the IRQ with the SA_SHIRQ flag. 1241one driver not having requested the IRQ with the IRQF_SHARED flag.
1242 1242
1243By default, the ncr53c8xx and sym53c8xx drivers request IRQs with both the 1243By default, the ncr53c8xx and sym53c8xx drivers request IRQs with both the
1244SA_INTERRUPT and the SA_SHIRQ flag under Linux-2.0 and with only the SA_SHIRQ 1244IRQF_DISABLED and the IRQF_SHARED flag under Linux-2.0 and with only the IRQF_SHARED
1245flag under Linux-2.2. 1245flag under Linux-2.2.
1246 1246
1247Under Linux-2.0, you can disable use of SA_INTERRUPT flag from the boot 1247Under Linux-2.0, you can disable use of IRQF_DISABLED flag from the boot
1248command line by using the following option: 1248command line by using the following option:
1249 1249
1250 ncr53c8xx=irqm:0x20 (for the generic ncr53c8xx driver) 1250 ncr53c8xx=irqm:0x20 (for the generic ncr53c8xx driver)
@@ -1252,7 +1252,7 @@ command line by using the following option:
1252 1252
1253If this does not fix the problem, then you may want to check how all other 1253If this does not fix the problem, then you may want to check how all other
1254drivers are requesting the IRQ and report the problem. Note that if at least 1254drivers are requesting the IRQ and report the problem. Note that if at least
1255a single driver does not request the IRQ with the SA_SHIRQ flag (share IRQ), 1255a single driver does not request the IRQ with the IRQF_SHARED flag (share IRQ),
1256then the request of the IRQ obviously will not succeed for all the drivers. 1256then the request of the IRQ obviously will not succeed for all the drivers.
1257 1257
125815. SCSI problem troubleshooting 125815. SCSI problem troubleshooting