diff mbox

cxl: Remove use of macro DEFINE_PCI_DEVICE_TABLE

Message ID 20150719172352.GA14386@vaishali-Ideapad-Z570 (mailing list archive)
State Accepted
Headers show

Commit Message

Vaishali Thakkar July 19, 2015, 5:23 p.m. UTC
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 <vthakkar1994@gmail.com>
---
 drivers/misc/cxl/pci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Michael Neuling July 20, 2015, 2:42 a.m. UTC | #1
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 <vthakkar1994@gmail.com>

Looks good, thanks!

Acked-by: Michael Neuling <mikey@neuling.org>


> ---
>  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), },
Ian Munsie July 20, 2015, 2:46 a.m. UTC | #2
Acked-by: Ian Munsie <imunsie@au1.ibm.com>
Michael Ellerman Aug. 27, 2015, 9:58 p.m. UTC | #3
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 <vthakkar1994@gmail.com>
> Acked-by: Michael Neuling <mikey@neuling.org>
> Acked-by: Ian Munsie <imunsie@au1.ibm.com>

Applied to powerpc next, thanks.

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

cheers
diff mbox

Patch

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), },