lkml.org 
[lkml]   [2014]   [Jul]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 16/18] staging: comedi: amplc_pci224: remove PCI_DEVICE_ID_... macros
    Date
    The macros `PCI_DEVICE_ID_AMPLICON_PCI224` and
    `PCI_DEVICE_ID_AMPLICON_PCI234` are only used in the PCI module device
    table `amplc_pci224_pci_table[]`. Just expand the macros where they are
    used and remove them. The macro `PCI_DEVICE_ID_INVALID` is no longer
    used either, so remove it.

    Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
    ---
    drivers/staging/comedi/drivers/amplc_pci224.c | 11 ++---------
    1 file changed, 2 insertions(+), 9 deletions(-)

    diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c b/drivers/staging/comedi/drivers/amplc_pci224.c
    index 977894d..4fceb7c 100644
    --- a/drivers/staging/comedi/drivers/amplc_pci224.c
    +++ b/drivers/staging/comedi/drivers/amplc_pci224.c
    @@ -113,13 +113,6 @@
    #include "8253.h"

    /*
    - * PCI IDs.
    - */
    -#define PCI_DEVICE_ID_AMPLICON_PCI224 0x0007
    -#define PCI_DEVICE_ID_AMPLICON_PCI234 0x0008
    -#define PCI_DEVICE_ID_INVALID 0xffff
    -
    -/*
    * PCI224/234 i/o space 1 (PCIBAR2) registers.
    */
    #define PCI224_Z2_CT0 0x14 /* 82C54 counter/timer 0 */
    @@ -1215,8 +1208,8 @@ static int amplc_pci224_pci_probe(struct pci_dev *dev,
    }

    static const struct pci_device_id amplc_pci224_pci_table[] = {
    - { PCI_VDEVICE(AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI224), pci224_model },
    - { PCI_VDEVICE(AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI234), pci234_model },
    + { PCI_VDEVICE(AMPLICON, 0x0007), pci224_model },
    + { PCI_VDEVICE(AMPLICON, 0x0008), pci234_model },
    { 0 }
    };
    MODULE_DEVICE_TABLE(pci, amplc_pci224_pci_table);
    --
    2.0.0


    \
     
     \ /
      Last update: 2014-07-31 16:41    [W:5.085 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site