* [PATCH 0/2] Remove last use and references to DEFINE_PCI_DEVICE_TABLE
@ 2016-08-31 16:19 Joe Perches
2016-08-31 16:19 ` [PATCH 1/2] wd719x: Remove last declaration using DEFINE_PCI_DEVICE_TABLE Joe Perches
2016-08-31 16:19 ` [PATCH 2/2] treewide: Remove references to the now unnecessary DEFINE_PCI_DEVICE_TABLE Joe Perches
0 siblings, 2 replies; 7+ messages in thread
From: Joe Perches @ 2016-08-31 16:19 UTC (permalink / raw)
To: Andrew Morton, linux-pci, linux-scsi
Cc: Bjorn Helgaas, Jonathan Corbet, James E.J. Bottomley,
Martin K. Petersen, Andy Whitcroft, linux-doc, linux-kernel
Joe Perches (2):
wd719x: Remove last declaration using DEFINE_PCI_DEVICE_TABLE
treewide: Remove references to the now unnecessary DEFINE_PCI_DEVICE_TABLE
Documentation/PCI/pci.txt | 1 -
drivers/scsi/wd719x.c | 2 +-
include/linux/pci.h | 9 ---------
scripts/checkpatch.pl | 9 ---------
scripts/tags.sh | 1 -
5 files changed, 1 insertion(+), 21 deletions(-)
--
2.10.0.rc2.1.gb2aa91d
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] wd719x: Remove last declaration using DEFINE_PCI_DEVICE_TABLE
2016-08-31 16:19 [PATCH 0/2] Remove last use and references to DEFINE_PCI_DEVICE_TABLE Joe Perches
@ 2016-08-31 16:19 ` Joe Perches
2016-09-01 1:00 ` Bart Van Assche
2016-09-02 10:36 ` Martin K. Petersen
2016-08-31 16:19 ` [PATCH 2/2] treewide: Remove references to the now unnecessary DEFINE_PCI_DEVICE_TABLE Joe Perches
1 sibling, 2 replies; 7+ messages in thread
From: Joe Perches @ 2016-08-31 16:19 UTC (permalink / raw)
To: Andrew Morton, James E.J. Bottomley, Martin K. Petersen
Cc: linux-scsi, linux-kernel
Convert it to the preferred const struct pci_device_id instead.
Signed-off-by: Joe Perches <joe@perches.com>
---
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 e3da1a2..2a9da2e 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) },
{}
};
--
2.10.0.rc2.1.gb2aa91d
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] treewide: Remove references to the now unnecessary DEFINE_PCI_DEVICE_TABLE
2016-08-31 16:19 [PATCH 0/2] Remove last use and references to DEFINE_PCI_DEVICE_TABLE Joe Perches
2016-08-31 16:19 ` [PATCH 1/2] wd719x: Remove last declaration using DEFINE_PCI_DEVICE_TABLE Joe Perches
@ 2016-08-31 16:19 ` Joe Perches
1 sibling, 0 replies; 7+ messages in thread
From: Joe Perches @ 2016-08-31 16:19 UTC (permalink / raw)
To: Andrew Morton, Bjorn Helgaas, Andy Whitcroft
Cc: Jonathan Corbet, linux-pci, linux-doc, linux-kernel
It's been eliminated from the sources, remove it from everywhere else.
Signed-off-by: Joe Perches <joe@perches.com>
---
Documentation/PCI/pci.txt | 1 -
include/linux/pci.h | 9 ---------
scripts/checkpatch.pl | 9 ---------
scripts/tags.sh | 1 -
4 files changed, 20 deletions(-)
diff --git a/Documentation/PCI/pci.txt b/Documentation/PCI/pci.txt
index 123881f..77f49dc 100644
--- a/Documentation/PCI/pci.txt
+++ b/Documentation/PCI/pci.txt
@@ -124,7 +124,6 @@ initialization with a pointer to a structure describing the driver
The ID table is an array of struct pci_device_id entries ending with an
all-zero entry. Definitions with static const are generally preferred.
-Use of the deprecated macro DEFINE_PCI_DEVICE_TABLE should be avoided.
Each entry consists of:
diff --git a/include/linux/pci.h b/include/linux/pci.h
index fbc1fa6..0ab8359 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -683,15 +683,6 @@ struct pci_driver {
#define to_pci_driver(drv) container_of(drv, struct pci_driver, driver)
/**
- * DEFINE_PCI_DEVICE_TABLE - macro used to describe a pci device table
- * @_table: device table name
- *
- * This macro is deprecated and should not be used in new code.
- */
-#define DEFINE_PCI_DEVICE_TABLE(_table) \
- const struct pci_device_id _table[]
-
-/**
* PCI_DEVICE - macro used to describe a specific pci device
* @vend: the 16 bit PCI Vendor ID
* @dev: the 16 bit PCI Device ID
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 8946904..1c82b01 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -3610,15 +3610,6 @@ sub process {
}
}
-# check for uses of DEFINE_PCI_DEVICE_TABLE
- if ($line =~ /\bDEFINE_PCI_DEVICE_TABLE\s*\(\s*(\w+)\s*\)\s*=/) {
- if (WARN("DEFINE_PCI_DEVICE_TABLE",
- "Prefer struct pci_device_id over deprecated DEFINE_PCI_DEVICE_TABLE\n" . $herecurr) &&
- $fix) {
- $fixed[$fixlinenr] =~ s/\b(?:static\s+|)DEFINE_PCI_DEVICE_TABLE\s*\(\s*(\w+)\s*\)\s*=\s*/static const struct pci_device_id $1\[\] = /;
- }
- }
-
# check for new typedefs, only function parameters and sparse annotations
# make sense.
if ($line =~ /\btypedef\s/ &&
diff --git a/scripts/tags.sh b/scripts/tags.sh
index ed7eef2..b3775a9 100755
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -206,7 +206,6 @@ regex_c=(
'/\<DEFINE_PER_CPU_SHARED_ALIGNED([^,]*, *\([[:alnum:]_]*\)/\1/v/'
'/\<DECLARE_WAIT_QUEUE_HEAD(\([[:alnum:]_]*\)/\1/v/'
'/\<DECLARE_\(TASKLET\|WORK\|DELAYED_WORK\)(\([[:alnum:]_]*\)/\2/v/'
- '/\<DEFINE_PCI_DEVICE_TABLE(\([[:alnum:]_]*\)/\1/v/'
'/\(^\s\)OFFSET(\([[:alnum:]_]*\)/\2/v/'
'/\(^\s\)DEFINE(\([[:alnum:]_]*\)/\2/v/'
'/\<DEFINE_HASHTABLE(\([[:alnum:]_]*\)/\1/v/'
--
2.10.0.rc2.1.gb2aa91d
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] wd719x: Remove last declaration using DEFINE_PCI_DEVICE_TABLE
2016-08-31 16:19 ` [PATCH 1/2] wd719x: Remove last declaration using DEFINE_PCI_DEVICE_TABLE Joe Perches
@ 2016-09-01 1:00 ` Bart Van Assche
2016-09-02 10:36 ` Martin K. Petersen
1 sibling, 0 replies; 7+ messages in thread
From: Bart Van Assche @ 2016-09-01 1:00 UTC (permalink / raw)
To: Joe Perches, Andrew Morton, James E.J. Bottomley, Martin K. Petersen
Cc: linux-scsi, linux-kernel
On 08/31/16 09:19, Joe Perches wrote:
> Convert it to the preferred const struct pci_device_id instead.
Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] wd719x: Remove last declaration using DEFINE_PCI_DEVICE_TABLE
2016-08-31 16:19 ` [PATCH 1/2] wd719x: Remove last declaration using DEFINE_PCI_DEVICE_TABLE Joe Perches
2016-09-01 1:00 ` Bart Van Assche
@ 2016-09-02 10:36 ` Martin K. Petersen
2016-09-02 17:16 ` Andrew Morton
1 sibling, 1 reply; 7+ messages in thread
From: Martin K. Petersen @ 2016-09-02 10:36 UTC (permalink / raw)
To: Joe Perches
Cc: Andrew Morton, James E.J. Bottomley, Martin K. Petersen,
linux-scsi, linux-kernel
>>>>> "Joe" == Joe Perches <joe@perches.com> writes:
Joe> Convert it to the preferred const struct pci_device_id instead.
Applied to 4.9/scsi-queue.
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] wd719x: Remove last declaration using DEFINE_PCI_DEVICE_TABLE
2016-09-02 10:36 ` Martin K. Petersen
@ 2016-09-02 17:16 ` Andrew Morton
2016-09-02 18:05 ` Martin K. Petersen
0 siblings, 1 reply; 7+ messages in thread
From: Andrew Morton @ 2016-09-02 17:16 UTC (permalink / raw)
To: Martin K. Petersen
Cc: Joe Perches, James E.J. Bottomley, linux-scsi, linux-kernel
On Fri, 02 Sep 2016 06:36:05 -0400 "Martin K. Petersen" <martin.petersen@oracle.com> wrote:
> >>>>> "Joe" == Joe Perches <joe@perches.com> writes:
>
> Joe> Convert it to the preferred const struct pci_device_id instead.
>
> Applied to 4.9/scsi-queue.
That creates an ordering dependency between the scsi tree and -mm's
"treewide: remove references to the now unnecessary
DEFINE_PCI_DEVICE_TABLE".
So an ack would be preferred, please.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] wd719x: Remove last declaration using DEFINE_PCI_DEVICE_TABLE
2016-09-02 17:16 ` Andrew Morton
@ 2016-09-02 18:05 ` Martin K. Petersen
0 siblings, 0 replies; 7+ messages in thread
From: Martin K. Petersen @ 2016-09-02 18:05 UTC (permalink / raw)
To: Andrew Morton
Cc: Martin K. Petersen, Joe Perches, James E.J. Bottomley,
linux-scsi, linux-kernel
>>>>> "Andrew" == Andrew Morton <akpm@linux-foundation.org> writes:
Andrew> That creates an ordering dependency between the scsi tree and
Andrew> -mm's "treewide: remove references to the now unnecessary
Andrew> DEFINE_PCI_DEVICE_TABLE".
Andrew> So an ack would be preferred, please.
OK. I was assuming that a subsequent patch would remove the macro.
I'll just drop the patch then.
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2016-09-02 18:05 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-31 16:19 [PATCH 0/2] Remove last use and references to DEFINE_PCI_DEVICE_TABLE Joe Perches
2016-08-31 16:19 ` [PATCH 1/2] wd719x: Remove last declaration using DEFINE_PCI_DEVICE_TABLE Joe Perches
2016-09-01 1:00 ` Bart Van Assche
2016-09-02 10:36 ` Martin K. Petersen
2016-09-02 17:16 ` Andrew Morton
2016-09-02 18:05 ` Martin K. Petersen
2016-08-31 16:19 ` [PATCH 2/2] treewide: Remove references to the now unnecessary DEFINE_PCI_DEVICE_TABLE Joe Perches
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).