2015-07-19 17:24:01

by Vaishali Thakkar

Subject: [PATCH] cxl: Remove use of macro DEFINE_PCI_DEVICE_TABLE

Macro DEFINE_PCI_DEVICE_TABLE is deprecated. So, here use
struct pci_device_id instead of DEFINE_PCI_DEVICE_TABLE with
the goal of getting rid of this macro completely.

The Coccinelle semantic patch that performs this transformation
is as follows:

@@
identifier a;
declarer name DEFINE_PCI_DEVICE_TABLE;
initializer i;
@@
- DEFINE_PCI_DEVICE_TABLE(a)
+ const struct pci_device_id a[]
= i;

Signed-off-by: Vaishali Thakkar <[email protected]>
---
drivers/misc/cxl/pci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c
index 32ad097..3ed0621 100644
--- a/drivers/misc/cxl/pci.c
+++ b/drivers/misc/cxl/pci.c
@@ -133,7 +133,7 @@ u8 cxl_afu_cr_read8(struct cxl_afu *afu, int cr, u64 off)
return (val >> ((off & 0x3) * 8)) & 0xff;
}

-static DEFINE_PCI_DEVICE_TABLE(cxl_pci_tbl) = {
+static const struct pci_device_id cxl_pci_tbl[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_IBM, 0x0477), },
{ PCI_DEVICE(PCI_VENDOR_ID_IBM, 0x044b), },
{ PCI_DEVICE(PCI_VENDOR_ID_IBM, 0x04cf), },
--
1.9.1

2015-07-20 02:42:28

by Michael Neuling

Subject: Re: [PATCH] cxl: Remove use of macro DEFINE_PCI_DEVICE_TABLE

On Sun, 2015-07-19 at 22:53 +0530, Vaishali Thakkar wrote:
> Macro DEFINE_PCI_DEVICE_TABLE is deprecated. So, here use
> struct pci_device_id instead of DEFINE_PCI_DEVICE_TABLE with
> the goal of getting rid of this macro completely.
>
> The Coccinelle semantic patch that performs this transformation
> is as follows:
>
> @@
> identifier a;
> declarer name DEFINE_PCI_DEVICE_TABLE;
> initializer i;
> @@
> - DEFINE_PCI_DEVICE_TABLE(a)
> + const struct pci_device_id a[]
> = i;
>
> Signed-off-by: Vaishali Thakkar <[email protected]>

Looks good, thanks!

Acked-by: Michael Neuling <[email protected]>


> ---
> drivers/misc/cxl/pci.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c
> index 32ad097..3ed0621 100644
> --- a/drivers/misc/cxl/pci.c
> +++ b/drivers/misc/cxl/pci.c
> @@ -133,7 +133,7 @@ u8 cxl_afu_cr_read8(struct cxl_afu *afu, int cr, u64 off)
> return (val >> ((off & 0x3) * 8)) & 0xff;
> }
>
> -static DEFINE_PCI_DEVICE_TABLE(cxl_pci_tbl) = {
> +static const struct pci_device_id cxl_pci_tbl[] = {
> { PCI_DEVICE(PCI_VENDOR_ID_IBM, 0x0477), },
> { PCI_DEVICE(PCI_VENDOR_ID_IBM, 0x044b), },
> { PCI_DEVICE(PCI_VENDOR_ID_IBM, 0x04cf), },

2015-07-20 02:47:07

by Ian Munsie

Subject: Re: [PATCH] cxl: Remove use of macro DEFINE_PCI_DEVICE_TABLE

Acked-by: Ian Munsie <[email protected]>

2015-08-27 21:58:37

by Michael Ellerman

Subject: Re: cxl: Remove use of macro DEFINE_PCI_DEVICE_TABLE

On Sun, 2015-19-07 at 17:23:52 UTC, Vaishali Thakkar wrote:
> Macro DEFINE_PCI_DEVICE_TABLE is deprecated. So, here use
> struct pci_device_id instead of DEFINE_PCI_DEVICE_TABLE with
> the goal of getting rid of this macro completely.
>
> The Coccinelle semantic patch that performs this transformation
> is as follows:
>
> @@
> identifier a;
> declarer name DEFINE_PCI_DEVICE_TABLE;
> initializer i;
> @@
> - DEFINE_PCI_DEVICE_TABLE(a)
> + const struct pci_device_id a[]
> = i;
>
> Signed-off-by: Vaishali Thakkar <[email protected]>
> Acked-by: Michael Neuling <[email protected]>
> Acked-by: Ian Munsie <[email protected]>

Applied to powerpc next, thanks.

https://git.kernel.org/powerpc/c/f47f966fbe0aaff4ebbdb83d

cheers