Use PCI_VENDOR_ID_INTEL instead of creating its own vendor ID #define.
Signed-off-by: Jon Mason <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
---
drivers/staging/media/dt3155v4l/dt3155v4l.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/staging/media/dt3155v4l/dt3155v4l.c b/drivers/staging/media/dt3155v4l/dt3155v4l.c
index 081407b..d3e1267 100644
--- a/drivers/staging/media/dt3155v4l/dt3155v4l.c
+++ b/drivers/staging/media/dt3155v4l/dt3155v4l.c
@@ -31,7 +31,6 @@
#include "dt3155v4l.h"
-#define DT3155_VENDOR_ID 0x8086
#define DT3155_DEVICE_ID 0x1223
/* DT3155_CHUNK_SIZE is 4M (2^22) 8 full size buffers */
@@ -975,7 +974,7 @@ dt3155_remove(struct pci_dev *pdev)
}
static DEFINE_PCI_DEVICE_TABLE(pci_ids) = {
- { PCI_DEVICE(DT3155_VENDOR_ID, DT3155_DEVICE_ID) },
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, DT3155_DEVICE_ID) },
{ 0, /* zero marks the end */ },
};
MODULE_DEVICE_TABLE(pci, pci_ids);
--
1.8.3.2
Remove unused #defines, structure, and inlined functions for the
rtl8192e driver. Compile tested only.
Signed-off-by: Jon Mason <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
---
drivers/staging/rtl8192e/rtl8192e/rtl_pci.h | 52 -----------------------------
1 file changed, 52 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_pci.h b/drivers/staging/rtl8192e/rtl8192e/rtl_pci.h
index 356aec4..4b94653 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_pci.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_pci.h
@@ -28,31 +28,6 @@
#include <linux/types.h>
#include <linux/pci.h>
-static inline void NdisRawWritePortUlong(u32 port, u32 val)
-{
- outl(val, port);
-}
-
-static inline void NdisRawWritePortUchar(u32 port, u8 val)
-{
- outb(val, port);
-}
-
-static inline void NdisRawReadPortUchar(u32 port, u8 *pval)
-{
- *pval = inb(port);
-}
-
-static inline void NdisRawReadPortUshort(u32 port, u16 *pval)
-{
- *pval = inw(port);
-}
-
-static inline void NdisRawReadPortUlong(u32 port, u32 *pval)
-{
- *pval = inl(port);
-}
-
struct mp_adapter {
u8 LinkCtrlReg;
@@ -70,33 +45,6 @@ struct mp_adapter {
u8 PciBridgeLinkCtrlReg;
};
-struct rt_pci_capab_header {
- unsigned char CapabilityID;
- unsigned char Next;
-};
-
-#define PCI_MAX_BRIDGE_NUMBER 255
-#define PCI_MAX_DEVICES 32
-#define PCI_MAX_FUNCTION 8
-
-#define PCI_CONF_ADDRESS 0x0CF8
-#define PCI_CONF_DATA 0x0CFC
-
-#define PCI_CLASS_BRIDGE_DEV 0x06
-#define PCI_SUBCLASS_BR_PCI_TO_PCI 0x04
-
-#define U1DONTCARE 0xFF
-#define U2DONTCARE 0xFFFF
-#define U4DONTCARE 0xFFFFFFFF
-
-#define INTEL_VENDOR_ID 0x8086
-#define SIS_VENDOR_ID 0x1039
-#define ATI_VENDOR_ID 0x1002
-#define ATI_DEVICE_ID 0x7914
-#define AMD_VENDOR_ID 0x1022
-
-#define PCI_CAPABILITY_ID_PCI_EXPRESS 0x10
-
struct net_device;
bool rtl8192_pci_findadapter(struct pci_dev *pdev, struct net_device *dev);
--
1.8.3.2
On Mon, Feb 24, 2014 at 01:08:19PM -0700, Jon Mason wrote:
> Use PCI_VENDOR_ID_INTEL instead of creating its own vendor ID #define.
>
> Signed-off-by: Jon Mason <[email protected]>
> Cc: Greg Kroah-Hartman <[email protected]>
> ---
> drivers/staging/media/dt3155v4l/dt3155v4l.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
$ ./scripts/get_maintainer.pl --file drivers/staging/media/dt3155v4l/dt3155v4l.c
Mauro Carvalho Chehab <[email protected]> (maintainer:MEDIA INPUT INFRA...,commit_signer:5/6=83%)
Greg Kroah-Hartman <[email protected]> (supporter:STAGING SUBSYSTEM,commit_signer:1/6=17%)
Hans Verkuil <[email protected]> (commit_signer:5/6=83%,authored:4/6=67%,added_lines:7/9=78%,removed_lines:5/10=50%)
Jingoo Han <[email protected]> (commit_signer:1/6=17%,authored:1/6=17%,added_lines:1/9=11%,removed_lines:1/10=10%)
"Lad, Prabhakar" <[email protected]> (commit_signer:1/6=17%)
Russell King <[email protected]> (authored:1/6=17%,added_lines:1/9=11%,removed_lines:4/10=40%)
[email protected] (open list:MEDIA INPUT INFRA...)
[email protected] (open list:STAGING SUBSYSTEM)
[email protected] (open list)
I am not the person to send this to, please use the tools we have to
determine who to send patches to so they can get properly applied.
thanks,
greg k-h