Skip to contentSkip to conversation

net: can: ctucanfd: remove useless copy of PCI_DEVICE_DATA macro

PATCH In review Ethan Nelson-Moore 2 participants 2 messages Jan 30 – Jan 31

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

PATCH 1/1 net: can: ctucanfd: remove useless copy of PCI_DEVICE_DATA macro

The ctucanfd driver has its own copy of the PCI_DEVICE_DATA macro. I assume this was done to support older kernel versions where it didn't exist, but that is irrelevant once the driver is in the mainline kernel. Remove it.

---
 drivers/net/can/ctucanfd/ctucanfd_pci.c | 8 --------
 1 file changed, 8 deletions(-)
drivers/net/can/ctucanfd/ctucanfd_pci.c +0 -8
index 9da09e7dd63a..35edac9c0a5c 100644
@@ -22,14 +22,6 @@
 
 #include "ctucanfd.h"
 
-#ifndef PCI_DEVICE_DATA
-#define PCI_DEVICE_DATA(vend, dev, data) \
-.vendor = PCI_VENDOR_ID_##vend, \
-.device = PCI_DEVICE_ID_##vend##_##dev, \
-.subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID, 0, 0, \
-.driver_data = (kernel_ulong_t)(data)
-#endif
-
 #ifndef PCI_VENDOR_ID_TEDIA
 #define PCI_VENDOR_ID_TEDIA 0x1760
 #endif
Signature · 1 line
2.43.0
#1 lore raw
Quoted 6 lines · Ethan Nelson-Moore

The ctucanfd driver has its own copy of the PCI_DEVICE_DATA macro. I assume this was done to support older kernel versions where it didn't exist, but that is irrelevant once the driver is in the mainline kernel. Remove it.

Added linux-can-next

regards,
Marc

Signature · 4 lines
Pengutronix e.K.                 | Marc Kleine-Budde          |
Embedded Linux                   | https://www.pengutronix.de |
Vertretung Nürnberg              | Phone: +49-5121-206917-129 |
Amtsgericht Hildesheim, HRA 2686 | Fax:   +49-5121-206917-9   |