Message ID | 1268668176.12629@pingi |
---|---|
State | Changes Requested, archived |
Delegated to: | David Miller |
Headers | show |
From: Karsten Keil <keil@b1-systems.de> Date: Mon, 15 Mar 2010 14:18:41 +0100 > A few subdevice IDs seem to have been dropped when hfc_multi was > included upstream, just compare the list at > http://www.openvox.cn/viewvc/misdn/trunk/hfc_multi.c?revision=75&view=annotate#l175 > with the IDs in drivers/isdn/hardware/mISDN/hfcmulti.c > > Added PCIe 2 Port card and LED settings (same as PCI) /KKe > > Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com> > Signed-off-by: Karsten Keil <keil@b1-systems.de> We don't add new defines to linux/pci_ids.h, it is deprecated. Simply add the device ID constants to the table. The only exception is the case where a device ID is used in more than one driver, but even that scenerio is heavily discouraged. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Dienstag, 16. März 2010 00:01:33 David Miller wrote: > From: Karsten Keil <keil@b1-systems.de> > Date: Mon, 15 Mar 2010 14:18:41 +0100 > > > A few subdevice IDs seem to have been dropped when hfc_multi was > > included upstream, just compare the list at > > http://www.openvox.cn/viewvc/misdn/trunk/hfc_multi.c?revision=75&view=ann > >otate#l175 with the IDs in drivers/isdn/hardware/mISDN/hfcmulti.c > > > > Added PCIe 2 Port card and LED settings (same as PCI) /KKe > > > > Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com> > > Signed-off-by: Karsten Keil <keil@b1-systems.de> > > We don't add new defines to linux/pci_ids.h, it is deprecated. > Simply add the device ID constants to the table. Good policy, makes sense. Will send a new version. May a check for adding defines to <linux/pci_ids> would help to enforce it. > > The only exception is the case where a device ID is used in > more than one driver, but even that scenerio is heavily > discouraged. > Is here some plan to cleanup drivers for -next and remove IDs from pci_ids.h, or should it not changed for old entries ? Karsten -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Karsten Keil <keil@b1-systems.de> Date: Tue, 16 Mar 2010 02:08:57 +0100 > Is here some plan to cleanup drivers for -next and remove IDs from pci_ids.h, > or should it not changed for old entries ? Leave things as they are for existing ones. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c index ad36df9..751b34c 100644 --- a/drivers/isdn/hardware/mISDN/hfcmulti.c +++ b/drivers/isdn/hardware/mISDN/hfcmulti.c @@ -5265,6 +5265,8 @@ static const struct hm_map hfcm_map[] = { /*31*/ {VENDOR_CCD, "XHFC-4S Speech Design", 5, 4, 0, 0, 0, 0, HFC_IO_MODE_EMBSD, XHFC_IRQ}, /*32*/ {VENDOR_JH, "HFC-8S (junghanns)", 8, 8, 1, 0, 0, 0, 0, 0}, +/*33*/ {VENDOR_BN, "HFC-2S Beronet Card PCIe", 4, 2, 1, 3, 0, DIP_4S, 0, 0}, +/*34*/ {VENDOR_BN, "HFC-4S Beronet Card PCIe", 4, 4, 1, 2, 0, DIP_4S, 0, 0}, }; #undef H @@ -5300,6 +5302,10 @@ static struct pci_device_id hfmultipci_ids[] __devinitdata = { PCI_SUBDEVICE_ID_CCD_OV4S, 0, 0, H(28)}, /* OpenVox 4 */ { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_HFC4S, PCI_VENDOR_ID_CCD, PCI_SUBDEVICE_ID_CCD_OV2S, 0, 0, H(29)}, /* OpenVox 2 */ + { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_HFC4S, PCI_VENDOR_ID_CCD, + PCI_SUBDEVICE_ID_CCD_BN2SE, 0, 0, H(33)}, /* BN2S PCIe */ + { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_HFC4S, PCI_VENDOR_ID_CCD, + PCI_SUBDEVICE_ID_CCD_BN4SE, 0, 0, H(34)}, /* BN4S PCIe */ /* Cards with HFC-8S Chip */ { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_HFC8S, PCI_VENDOR_ID_CCD, diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 9f688d2..a5cc675 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1923,6 +1923,8 @@ #define PCI_SUBDEVICE_ID_CCD_HFC8S 0xB622 #define PCI_DEVICE_ID_CCD_B700 0xb700 #define PCI_DEVICE_ID_CCD_B701 0xb701 +#define PCI_SUBDEVICE_ID_CCD_BN2SE 0xb761 +#define PCI_SUBDEVICE_ID_CCD_BN4SE 0xb762 #define PCI_SUBDEVICE_ID_CCD_HFCE1 0xC523 #define PCI_SUBDEVICE_ID_CCD_OV2S 0xE884 #define PCI_SUBDEVICE_ID_CCD_OV4S 0xE888