lkml.org 
[lkml]   [2007]   [Sep]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH] pci: fix unterminated pci_device_id lists
    On Thu, Sep 13, 2007 at 10:34:02AM +0400, Alexey Dobriyan wrote:
    > [non-terminated PCI ids arrays]
    >
    > Here is compile-time hack (yep, warped and whitespace damaged :))
    > It's better than modpost-time hack. because it triggers earlier.
    > It's worse than modpost-time hack, because of tree-wide changes.
    >
    > diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
    > index f4e4298..b895b5f 100644
    > --- a/drivers/net/8139too.c
    > +++ b/drivers/net/8139too.c
    > @@ -237,7 +237,7 @@ static const struct {
    > };
    >
    >
    > -static struct pci_device_id rtl8139_pci_tbl[] = {
    > +PCI_MODULE_DEVICE_TABLE_BEGIN(rtl8139_pci_tbl)
    > {0x10ec, 0x8139, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
    > {0x10ec, 0x8138, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
    > {0x1113, 0x1211, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
    > @@ -273,10 +273,7 @@ static struct pci_device_id rtl8139_pci_tbl[] = {
    > {PCI_ANY_ID, 0x8139, 0x10ec, 0x8139, 0, 0, RTL8139 },
    > {PCI_ANY_ID, 0x8139, 0x1186, 0x1300, 0, 0, RTL8139 },
    > {PCI_ANY_ID, 0x8139, 0x13d1, 0xab06, 0, 0, RTL8139 },
    > -
    > - {0,}
    > -};
    > -MODULE_DEVICE_TABLE (pci, rtl8139_pci_tbl);
    > +PCI_MODULE_DEVICE_TABLE_END

    Looks at bit too magic to my taste.
    And anyway deferring the check until modpost time should not cause troubles
    anyway assuming people do build their kernel after adding a device ID.

    And the above requires one to use the special macro in all places
    whereas the modpost check will catch it also for new device ID users.

    Sam
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-09-13 08:59    [W:0.023 / U:29.788 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site