On Sun, Jan 07, 2007 at 10:40:49AM -0500, Mark M. Hoffman wrote:
> Hi Jean, Adrian, et. al.:
>
> * Jean Delvare <[email protected]> [2007-01-07 12:30:13 +0100]:
> > Hi Adrian,
> >
> > On Sat, 6 Jan 2007 00:29:13 +0100, Adrian Bunk wrote:
>...
> > > Was this intentional (and quirk_sis_96x_compatible() should be removed),
> > > or is this a bug that should be fixed?
> >
> > I noticed this too in April 2006, see:
> > http://lists.lm-sensors.org/pipermail/lm-sensors/2006-April/016016.html
> >
> > Quoting myself back then:
> > "The whole sis_96x_compatible stuff looks superfluous now. It was used
> > before 2.6.0-test10, but we could certainly get rid of it now."
> >
> > I do not think there is a bug here, or someone would have complained by
> > now. Note though that I do not have a SiS-based motherboard to test on.
> > Mark may be able to help with testing.
>
> It's just cruft from the original quirk. The "compatible" printk could have
> had value as a diagnostic in case the new quirk didn't work for some reason,
> but I never saw any complaints about it (apart from the link order problem,
> which is something different.) It's safe to remove by now.
Below is a patch to remove it.
> Regards,
> Mark M. Hoffman
cu
Adrian
<-- snip -->
Since 2.6.0-test10, all quirk_sis_96x_compatible() had any effect on
was a printk().
This patch therefore removes it.
Signed-off-by: Adrian Bunk <[email protected]>
---
drivers/pci/quirks.c | 15 ---------------
1 file changed, 15 deletions(-)
--- linux-2.6.20-rc4-mm1/drivers/pci/quirks.c.old 2007-01-14 09:58:01.000000000 +0100
+++ linux-2.6.20-rc4-mm1/drivers/pci/quirks.c 2007-01-14 09:58:37.000000000 +0100
@@ -1141,8 +1141,6 @@
*
* We can also enable the sis96x bit in the discovery register..
*/
-static int __devinitdata sis_96x_compatible = 0;
-
#define SIS_DETECT_REGISTER 0x40
static void quirk_sis_503(struct pci_dev *dev)
@@ -1158,9 +1156,6 @@
return;
}
- /* Make people aware that we changed the config.. */
- printk(KERN_WARNING "Uncovering SIS%x that hid as a SIS503 (compatible=%d)\n", devid, sis_96x_compatible);
-
/*
* Ok, it now shows up as a 96x.. run the 96x quirk by
* hand in case it has already been processed.
@@ -1172,16 +1167,6 @@
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503, quirk_sis_503 );
DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503, quirk_sis_503 );
-static void __init quirk_sis_96x_compatible(struct pci_dev *dev)
-{
- sis_96x_compatible = 1;
-}
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_645, quirk_sis_96x_compatible );
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_646, quirk_sis_96x_compatible );
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_648, quirk_sis_96x_compatible );
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_650, quirk_sis_96x_compatible );
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_651, quirk_sis_96x_compatible );
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_735, quirk_sis_96x_compatible );
/*
* On ASUS A8V and A8V Deluxe boards, the onboard AC97 audio controller
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
