Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b72ae8ca authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Bjorn Helgaas
Browse files

PCI: Add PCI_DEVICE_DATA() macro to fully describe device ID entry 



There are a lot of examples in the kernel where PCI_VDEVICE() is used and
still looks not so convenient due to additional driver_data field attached.

Introduce PCI_DEVICE_DATA() macro to fully describe device ID entry in
shortest possible form. For example,

  before:

    { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_MRFLD),
      (kernel_ulong_t) &dwc3_pci_mrfld_properties, },

  after:

    { PCI_DEVICE_DATA(INTEL, MRFLD, &dwc3_pci_mrfld_properties) },

Drivers can be converted later on in independent way.

While here, remove the unused macro with the same name from Ralink wireless
driver.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: Kalle Valo <kvalo@codeaurora.org>	# for rt2x00
parent 546c596c

drivers/net/wireless/ralink/rt2x00/rt2x00pci.h

+0 −6
Original line number Original line Diff line number Diff line
@@ -27,12 +27,6 @@ 
#include <linux/io.h>

#include <linux/io.h>

#include <linux/pci.h>

#include <linux/pci.h>





/*

 * This variable should be used with the

 * pci_driver structure initialization.

 */

#define PCI_DEVICE_DATA(__ops)	.driver_data = (kernel_ulong_t)(__ops)



/*

/*

 * PCI driver handlers.

 * PCI driver handlers.

 */

 */

include/linux/pci.h

+15 −0
Original line number Original line Diff line number Diff line
@@ -819,6 +819,21 @@ struct pci_driver { 
	.vendor = PCI_VENDOR_ID_##vend, .device = (dev), \

	.vendor = PCI_VENDOR_ID_##vend, .device = (dev), \

	.subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID, 0, 0

	.subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID, 0, 0





/**

 * PCI_DEVICE_DATA - macro used to describe a specific PCI device in very short form

 * @vend: the vendor name (without PCI_VENDOR_ID_ prefix)

 * @dev: the device name (without PCI_DEVICE_ID_<vend>_ prefix)

 * @data: the driver data to be filled

 *

 * This macro is used to create a struct pci_device_id that matches a

 * specific PCI device.  The subvendor, and subdevice fields will be set

 * to PCI_ANY_ID.

 */

#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)



enum {

enum {

	PCI_REASSIGN_ALL_RSRC	= 0x00000001,	/* Ignore firmware setup */

	PCI_REASSIGN_ALL_RSRC	= 0x00000001,	/* Ignore firmware setup */

	PCI_REASSIGN_ALL_BUS	= 0x00000002,	/* Reassign all bus numbers */

	PCI_REASSIGN_ALL_BUS	= 0x00000002,	/* Reassign all bus numbers */