2015-07-17 05:46:51

by Vaishali Thakkar

Subject: [PATCH] wd719x: 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]>
---
This patch is against linux-next branch
---
drivers/scsi/wd719x.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/wd719x.c b/drivers/scsi/wd719x.c
index 61346aa..4655d16 100644
--- a/drivers/scsi/wd719x.c
+++ b/drivers/scsi/wd719x.c
@@ -962,7 +962,7 @@ static void wd719x_pci_remove(struct pci_dev *pdev)
scsi_host_put(sh);
}

-static DEFINE_PCI_DEVICE_TABLE(wd719x_pci_table) = {
+static const struct pci_device_id wd719x_pci_table[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_WD, 0x3296) },
{}
};
--
1.9.1

2015-11-10 02:56:42

by Vaishali Thakkar

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

On Fri, Jul 17, 2015 at 11:16 AM, Vaishali Thakkar
<[email protected]> 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]>
> ---
> This patch is against linux-next branch
> ---
> drivers/scsi/wd719x.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/scsi/wd719x.c b/drivers/scsi/wd719x.c
> index 61346aa..4655d16 100644
> --- a/drivers/scsi/wd719x.c
> +++ b/drivers/scsi/wd719x.c
> @@ -962,7 +962,7 @@ static void wd719x_pci_remove(struct pci_dev *pdev)
> scsi_host_put(sh);
> }
>
> -static DEFINE_PCI_DEVICE_TABLE(wd719x_pci_table) = {
> +static const struct pci_device_id wd719x_pci_table[] = {
> { PCI_DEVICE(PCI_VENDOR_ID_WD, 0x3296) },
> {}
> };
> --
> 1.9.1
>

Hi James,

Can you please apply this patch? Actually this is the only case which is using
DEFINE_PCI_DEVICE_TABLE in the kernel and the use is blocking the removal
of everything related to this macro in the kernel. So, it would be
good if you can
apply this patch.

Inform me if it's not in your queue and I need to resend it.

Thanks

--
Vaishali