[PATCH] perf/x86/intel/uncore: Remove use of macro DEFINE_PCI_DEVICE_TABLE

[PATCH] perf/x86/intel/uncore: Remove use of macro DEFINE_PCI_DEVICE_TABLE

[Vaishali Thakkar]

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>
---
 arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c b/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c
index 6d6e85d..76a3feb 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c
@@ -2215,7 +2215,7 @@ static struct intel_uncore_type *hswep_pci_uncores[] = {
 	NULL,
 };
 
-static DEFINE_PCI_DEVICE_TABLE(hswep_uncore_pci_ids) = {
+static const struct pci_device_id hswep_uncore_pci_ids[] = {
 	{ /* Home Agent 0 */
 		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x2f30),
 		.driver_data = UNCORE_PCI_DEV_DATA(HSWEP_PCI_UNCORE_HA, 0),
-- 
1.9.1

[tip:perf/core] perf/x86/intel/uncore: Remove use of macro DEFINE_PCI_DEVICE_TABLE()

[tip-bot for Vaishali Thakkar]

Commit-ID:  070a7cdfa4a0a799235d79e58e7b0b2d94dff190
Gitweb:     http://git.kernel.org/tip/070a7cdfa4a0a799235d79e58e7b0b2d94dff190
Author:     Vaishali Thakkar <vthakkar1994@gmail.com>
AuthorDate: Fri, 17 Jul 2015 10:57:59 +0530
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 4 Aug 2015 10:16:52 +0200

perf/x86/intel/uncore: Remove use of macro DEFINE_PCI_DEVICE_TABLE()

The DEFINE_PCI_DEVICE_TABLE() macro is deprecated. Use
'struct pci_device_id' instead of DEFINE_PCI_DEVICE_TABLE(),
with the goal of getting rid of this macro completely.

This Coccinelle semantic patch performs this transformation:

@@
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>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20150717052759.GA6265@vaishali-Ideapad-Z570
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c b/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c
index 6d6e85d..76a3feb 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c
@@ -2215,7 +2215,7 @@ static struct intel_uncore_type *hswep_pci_uncores[] = {
 	NULL,
 };
 
-static DEFINE_PCI_DEVICE_TABLE(hswep_uncore_pci_ids) = {
+static const struct pci_device_id hswep_uncore_pci_ids[] = {
 	{ /* Home Agent 0 */
 		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x2f30),
 		.driver_data = UNCORE_PCI_DEV_DATA(HSWEP_PCI_UNCORE_HA, 0),

Re: [PATCH] perf/x86/intel/uncore: Remove use of macro DEFINE_PCI_DEVICE_TABLE

[Vaishali Thakkar]

Ping!

On Fri, Jul 17, 2015 at 10:57 AM, Vaishali Thakkar
<vthakkar1994@gmail.com> 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>
> ---
>  arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c b/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c
> index 6d6e85d..76a3feb 100644
> --- a/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c
> +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c
> @@ -2215,7 +2215,7 @@ static struct intel_uncore_type *hswep_pci_uncores[] = {
>         NULL,
>  };
>
> -static DEFINE_PCI_DEVICE_TABLE(hswep_uncore_pci_ids) = {
> +static const struct pci_device_id hswep_uncore_pci_ids[] = {
>         { /* Home Agent 0 */
>                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x2f30),
>                 .driver_data = UNCORE_PCI_DEV_DATA(HSWEP_PCI_UNCORE_HA, 0),
> --
> 1.9.1
>



-- 
Vaishali

Re: [PATCH] perf/x86/intel/uncore: Remove use of macro DEFINE_PCI_DEVICE_TABLE

[Ingo Molnar]

* Vaishali Thakkar <vthakkar1994@gmail.com> wrote:

> Ping!

Pong. This patch is already upstream.

Thanks,

	Ingo

Re: [PATCH] perf/x86/intel/uncore: Remove use of macro DEFINE_PCI_DEVICE_TABLE

[Vaishali Thakkar]

On Thu, Oct 1, 2015 at 1:37 PM, Ingo Molnar <mingo@kernel.org> wrote:
>
> * Vaishali Thakkar <vthakkar1994@gmail.com> wrote:
>
>> Ping!
>
> Pong. This patch is already upstream.

Oops! Sorry. I just realized that you already applied it but it is
still showing me in linux-next
when grepped for it and is blocking the road in removing the macro definition.

Sorry for the noise.

> Thanks,
>
>         Ingo



-- 
Vaishali

Re: [PATCH] perf/x86/intel/uncore: Remove use of macro DEFINE_PCI_DEVICE_TABLE

[Ingo Molnar]

* Vaishali Thakkar <vthakkar1994@gmail.com> wrote:

> On Thu, Oct 1, 2015 at 1:37 PM, Ingo Molnar <mingo@kernel.org> wrote:
> >
> > * Vaishali Thakkar <vthakkar1994@gmail.com> wrote:
> >
> >> Ping!
> >
> > Pong. This patch is already upstream.
> 
> Oops! Sorry. I just realized that you already applied it but it is
> still showing me in linux-next
> when grepped for it and is blocking the road in removing the macro definition.

So I think what you saw in linux-next is another usage of the old macro, in the 
same file - which usage arrived since you did the first patch.

> 
> Sorry for the noise.

np.

Thanks,

	Ingo

Re: [PATCH] perf/x86/intel/uncore: Remove use of macro DEFINE_PCI_DEVICE_TABLE

[Vaishali Thakkar]

On Thu, Oct 1, 2015 at 1:55 PM, Ingo Molnar <mingo@kernel.org> wrote:
>
> * Vaishali Thakkar <vthakkar1994@gmail.com> wrote:
>
>> On Thu, Oct 1, 2015 at 1:37 PM, Ingo Molnar <mingo@kernel.org> wrote:
>> >
>> > * Vaishali Thakkar <vthakkar1994@gmail.com> wrote:
>> >
>> >> Ping!
>> >
>> > Pong. This patch is already upstream.
>>
>> Oops! Sorry. I just realized that you already applied it but it is
>> still showing me in linux-next
>> when grepped for it and is blocking the road in removing the macro definition.
>
> So I think what you saw in linux-next is another usage of the old macro, in the
> same file - which usage arrived since you did the first patch.

Ah, yes. That's why I was confused. Thanks.

Let me send a patch for that.

>>
>> Sorry for the noise.
>
> np.
>
> Thanks,
>
>         Ingo



-- 
Vaishali