[PATCH 04/19] drivers/char/hw_random: Use PCI_VDEVICE

[Matt Mackall]

On Wed, 2009-06-24 at 22:13 -0700, Joe Perches wrote:
> Signed-off-by: Joe Perches <joe at perches.com>
> ---
>  drivers/char/hw_random/amd-rng.c   |    4 ++--
>  drivers/char/hw_random/geode-rng.c |    3 +--
>  2 files changed, 3 insertions(+), 4 deletions(-)

Acked-by: Matt Mackall <mpm at selenic.com>

> diff --git a/drivers/char/hw_random/amd-rng.c b/drivers/char/hw_random/amd-rng.c
> index cd0ba51..0d8c578 100644
> --- a/drivers/char/hw_random/amd-rng.c
> +++ b/drivers/char/hw_random/amd-rng.c
> @@ -44,8 +44,8 @@
>   * want to register another driver on the same PCI id.
>   */
>  static const struct pci_device_id pci_tbl[] = {
> -	{ 0x1022, 0x7443, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
> -	{ 0x1022, 0x746b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
> +	{ PCI_VDEVICE(AMD, 0x7443), 0, },
> +	{ PCI_VDEVICE(AMD, 0x746b), 0, },
>  	{ 0, },	/* terminate list */
>  };
>  MODULE_DEVICE_TABLE(pci, pci_tbl);
> diff --git a/drivers/char/hw_random/geode-rng.c b/drivers/char/hw_random/geode-rng.c
> index 64d513f..4c4d4e1 100644
> --- a/drivers/char/hw_random/geode-rng.c
> +++ b/drivers/char/hw_random/geode-rng.c
> @@ -46,8 +46,7 @@
>   * want to register another driver on the same PCI id.
>   */
>  static const struct pci_device_id pci_tbl[] = {
> -	{ PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LX_AES,
> -	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
> +	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_LX_AES), 0, },
>  	{ 0, },	/* terminate list */
>  };
>  MODULE_DEVICE_TABLE(pci, pci_tbl);

-- 
http://selenic.com : development and support for Mercurial and Linux