lkml.org 
[lkml]   [2002]   [May]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH] trivial patch for fixme in ide-pci.c
From
Date
The following cleanup patch gets rid of a FIXME in ide-pci.c.  It
compiles, but it's untested since I don't have that hardware.

Gerald

diff -urN linux-2.5.13.orig/drivers/ide/hpt366.c linux-2.5.13/drivers/ide/hpt366.c
--- linux-2.5.13.orig/drivers/ide/hpt366.c Thu May 2 19:22:42 2002
+++ linux-2.5.13/drivers/ide/hpt366.c Thu May 2 21:29:32 2002
@@ -346,8 +346,6 @@
static unsigned int pci_rev_check_hpt3xx(struct pci_dev *dev);
static unsigned int pci_rev2_check_hpt3xx(struct pci_dev *dev);
byte hpt366_proc = 0;
-byte hpt363_shared_irq;
-byte hpt363_shared_pin;
extern char *ide_xfer_verbose (byte xfer_rate);

#if defined(DISPLAY_HPT366_TIMINGS) && defined(CONFIG_PROC_FS)
diff -urN linux-2.5.13.orig/drivers/ide/ide-pci.c linux-2.5.13/drivers/ide/ide-pci.c
--- linux-2.5.13.orig/drivers/ide/ide-pci.c Thu May 2 19:22:56 2002
+++ linux-2.5.13/drivers/ide/ide-pci.c Thu May 2 21:53:01 2002
@@ -81,17 +81,10 @@
#endif

#ifdef CONFIG_BLK_DEV_HPT366
-extern byte hpt363_shared_irq;
-extern byte hpt363_shared_pin;
-
extern unsigned int pci_init_hpt366(struct pci_dev *);
extern unsigned int ata66_hpt366(struct ata_channel *);
extern void ide_init_hpt366(struct ata_channel *);
extern void ide_dmacapable_hpt366(struct ata_channel *, unsigned long);
-#else
-/* FIXME: those have to be killed */
-static byte hpt363_shared_irq;
-static byte hpt363_shared_pin;
#endif

#ifdef CONFIG_BLK_DEV_NS87415
@@ -843,9 +836,7 @@
(PCI_FUNC(findev->devfn) & 1)) {
dev2 = findev;
pci_read_config_byte(dev2, PCI_INTERRUPT_PIN, &pin2);
- hpt363_shared_pin = (pin1 != pin2) ? 1 : 0;
- hpt363_shared_irq = (dev->irq == dev2->irq) ? 1 : 0;
- if (hpt363_shared_pin && hpt363_shared_irq) {
+ if (pin1 != pin2 && dev->irq == dev2->irq) {
d->bootable = ON_BOARD;
printk("%s: onboard version of chipset, pin1=%d pin2=%d\n", dev->name, pin1, pin2);
}
\
 
 \ /
  Last update: 2005-03-22 13:25    [W:0.046 / U:0.964 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site