Skip to contentSkip to conversation

pci.h/pci_ids.h related cleanups

PATCH Applied Michael S. Tsirkin 3 participants 9 messages Mar 30, 2015 – Apr 6, 2015

Subsystems (12)
lore
Share & tools
lore
#0 lore raw

v2 cover pci.h/pci_ids.h related cleanups

A bunch of drivers pull in linux/pci.h or linux/pci_ids.h without actually using any PCI APIs.

Clean this up, drop the includes.

These patches were split out from bigger pci_ids.h exporting patchset.

I think the pci tree is easiest to use for these changes. Please review, and consider for 4.1.

Changes from v1:
patches are unchanged
drop amd patch - applied on driver specific tree added acks for brcm80211

Michael S. Tsirkin (6):
crypto/ccp: drop linux/pci dependencies
input/serio: drop pci_ids dependency
media/fintek: drop pci_ids dependency
brcm80211: drop pci dependency
brcm80211: drop pci_ids include
staging/olpc: drop pci dependencies

 drivers/crypto/ccp/ccp-ops.c                     | 2 --
 drivers/input/serio/gscps2.c                     | 1 -
 drivers/media/rc/fintek-cir.c                    | 1 -
 drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 2 --
 drivers/net/wireless/brcm80211/brcmfmac/sdio.c   | 1 -
 drivers/staging/olpc_dcon/olpc_dcon.c            | 2 --
 6 files changed, 9 deletions(-)
Signature · 1 line
MST
#1 lore raw

PATCH v2 1/6 crypto/ccp: drop linux/pci dependencies

pci code is in ccp-pci.c, don't include pci
headers from ccp/ccp-ops.c.

---
 drivers/crypto/ccp/ccp-ops.c | 2 --
 1 file changed, 2 deletions(-)
drivers/crypto/ccp/ccp-ops.c +0 -2
index 8729364..3da1140 100644
@@ -12,8 +12,6 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/pci.h>
-#include <linux/pci_ids.h>
 #include <linux/kthread.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
Signature · 1 line
MST
#2 lore raw

PATCH v2 2/6 input/serio: drop pci_ids dependency

In reply to Michael S. Tsirkin

This driver does not use any PCI IDs, don't include the pci_ids.h header.

---
 drivers/input/serio/gscps2.c | 1 -
 1 file changed, 1 deletion(-)
drivers/input/serio/gscps2.c +0 -1
index 94ab494..ecba666 100644
@@ -31,7 +31,6 @@
 #include <linux/spinlock.h>
 #include <linux/delay.h>
 #include <linux/ioport.h>
-#include <linux/pci_ids.h>
 
 #include <asm/irq.h>
 #include <asm/io.h>
Signature · 1 line
MST
maintainer Applied
#3 lore raw

Re: [PATCH v2 2/6] input/serio: drop pci_ids dependency

Quoted 4 lines · Michael S. Tsirkin

This driver does not use any PCI IDs, don't include the pci_ids.h header.

Applied, thank you.

Quoted 19 lines
---
 drivers/input/serio/gscps2.c | 1 -
 1 file changed, 1 deletion(-)
drivers/input/serio/gscps2.c +0 -1
index 94ab494..ecba666 100644
@@ -31,7 +31,6 @@
 #include <linux/spinlock.h>
 #include <linux/delay.h>
 #include <linux/ioport.h>
-#include <linux/pci_ids.h>
 
 #include <asm/irq.h>
 #include <asm/io.h>
Signature · 1 line
MST
Signature · 1 line
Dmitry
#4 lore raw

PATCH v2 3/6 media/fintek: drop pci_ids dependency

In reply to Michael S. Tsirkin

This driver does not use any PCI IDs, don't include the pci_ids.h header.

---
 drivers/media/rc/fintek-cir.c | 1 -
 1 file changed, 1 deletion(-)
drivers/media/rc/fintek-cir.c +0 -1
index b516757..9ca168a 100644
@@ -33,7 +33,6 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <media/rc-core.h>
-#include <linux/pci_ids.h>
 
 #include "fintek-cir.h"
 
Signature · 1 line
MST
Acked-by on v2 3/6
#5 lore raw

Re: [PATCH v2 3/6] media/fintek: drop pci_ids dependency

Em Mon, 30 Mar 2015 12:59:32 +0200
"Michael S. Tsirkin" <[email protected]> escreveu:

Quoted 4 lines

This driver does not use any PCI IDs, don't include the pci_ids.h header.

Yeah, someone just cut and paste the dependencies from some other IR driver without checking.

Quoted 16 lines
---
 drivers/media/rc/fintek-cir.c | 1 -
 1 file changed, 1 deletion(-)
drivers/media/rc/fintek-cir.c +0 -1
index b516757..9ca168a 100644
@@ -33,7 +33,6 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <media/rc-core.h>
-#include <linux/pci_ids.h>
 
 #include "fintek-cir.h"
 
Signature · 2 lines
Cheers,
Mauro
#6 lore raw

PATCH v2 4/6 brcm80211: drop pci dependency

In reply to Michael S. Tsirkin

This file does not use any pci APIs, drop
pci header includes.

---
 drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 2 --
 1 file changed, 2 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c +0 -2
index 7944224..9331486 100644
@@ -17,8 +17,6 @@
 
 #include <linux/types.h>
 #include <linux/netdevice.h>
-#include <linux/pci.h>
-#include <linux/pci_ids.h>
 #include <linux/sched.h>
 #include <linux/completion.h>
 #include <linux/scatterlist.h>
Signature · 1 line
MST
#7 lore raw

PATCH v2 5/6 brcm80211: drop pci_ids include

In reply to Michael S. Tsirkin

This file does not use any pci ids, drop
pci_ids.h include.

---
 drivers/net/wireless/brcm80211/brcmfmac/sdio.c | 1 -
 1 file changed, 1 deletion(-)
drivers/net/wireless/brcm80211/brcmfmac/sdio.c +0 -1
index faec35c..da479d4 100644
@@ -18,7 +18,6 @@
 #include <linux/kernel.h>
 #include <linux/kthread.h>
 #include <linux/printk.h>
-#include <linux/pci_ids.h>
 #include <linux/netdevice.h>
 #include <linux/interrupt.h>
 #include <linux/sched.h>
Signature · 1 line
MST
#8 lore raw

PATCH v2 6/6 staging/olpc: drop pci dependencies

In reply to Michael S. Tsirkin

This file does not use any pci APIs, drop
pci header includes.

---
 drivers/staging/olpc_dcon/olpc_dcon.c | 2 --
 1 file changed, 2 deletions(-)
drivers/staging/olpc_dcon/olpc_dcon.c +0 -2
index bc7e664..d115f5c 100644
@@ -18,8 +18,6 @@
 #include <linux/console.h>
 #include <linux/i2c.h>
 #include <linux/platform_device.h>
-#include <linux/pci.h>
-#include <linux/pci_ids.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/module.h>
Signature · 1 line
MST