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

Commit a870614a authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/ifndefs' into next 

* pci/ifndefs:
  PCI: Cleanup pci.h whitespace
  PCI: Reorder so actual code comes before stubs
parents 597db6f3 2ee546c4

drivers/pci/pci-label.c

+25 −32
Original line number Diff line number Diff line
@@ -34,21 +34,7 @@ 


#define	DEVICE_LABEL_DSM	0x07



#ifndef CONFIG_DMI



static inline int

pci_create_smbiosname_file(struct pci_dev *pdev)

{

	return -1;

}



static inline void

pci_remove_smbiosname_file(struct pci_dev *pdev)

{

}



#else



#ifdef CONFIG_DMI

enum smbios_attr_enum {

	SMBIOS_ATTR_NONE = 0,

	SMBIOS_ATTR_LABEL_SHOW,
@@ -156,31 +142,20 @@ pci_remove_smbiosname_file(struct pci_dev *pdev) 
{

	sysfs_remove_group(&pdev->dev.kobj, &smbios_attr_group);

}



#endif



#ifndef CONFIG_ACPI



static inline int

pci_create_acpi_index_label_files(struct pci_dev *pdev)

{

	return -1;

}



#else

static inline int

pci_remove_acpi_index_label_files(struct pci_dev *pdev)

pci_create_smbiosname_file(struct pci_dev *pdev)

{

	return -1;

}



static inline bool

device_has_dsm(struct device *dev)

static inline void

pci_remove_smbiosname_file(struct pci_dev *pdev)

{

	return false;

}

#endif



#else



#ifdef CONFIG_ACPI

static const char device_label_dsm_uuid[] = {

	0xD0, 0x37, 0xC9, 0xE5, 0x53, 0x35, 0x7A, 0x4D,

	0x91, 0x17, 0xEA, 0x4D, 0x19, 0xC3, 0x43, 0x4D
@@ -364,6 +339,24 @@ pci_remove_acpi_index_label_files(struct pci_dev *pdev) 
	sysfs_remove_group(&pdev->dev.kobj, &acpi_attr_group);

	return 0;

}

#else

static inline int

pci_create_acpi_index_label_files(struct pci_dev *pdev)

{

	return -1;

}



static inline int

pci_remove_acpi_index_label_files(struct pci_dev *pdev)

{

	return -1;

}



static inline bool

device_has_dsm(struct device *dev)

{

	return false;

}

#endif



void pci_create_firmware_label_files(struct pci_dev *pdev)

include/linux/pci.h

+68 −198
Original line number Diff line number Diff line
@@ -1149,58 +1149,7 @@ struct msix_entry { 
};





#ifndef CONFIG_PCI_MSI

static inline int pci_msi_vec_count(struct pci_dev *dev)

{

	return -ENOSYS;

}



static inline int pci_enable_msi_block(struct pci_dev *dev, int nvec)

{

	return -ENOSYS;

}



static inline void pci_msi_shutdown(struct pci_dev *dev)

{ }

static inline void pci_disable_msi(struct pci_dev *dev)

{ }



static inline int pci_msix_vec_count(struct pci_dev *dev)

{

	return -ENOSYS;

}

static inline int pci_enable_msix(struct pci_dev *dev,

				  struct msix_entry *entries, int nvec)

{

	return -ENOSYS;

}



static inline void pci_msix_shutdown(struct pci_dev *dev)

{ }

static inline void pci_disable_msix(struct pci_dev *dev)

{ }



static inline void msi_remove_pci_irq_vectors(struct pci_dev *dev)

{ }



static inline void pci_restore_msi_state(struct pci_dev *dev)

{ }

static inline int pci_msi_enabled(void)

{

	return 0;

}



static inline int pci_enable_msi_range(struct pci_dev *dev, int minvec,

				       int maxvec)

{

	return -ENOSYS;

}

static inline int pci_enable_msix_range(struct pci_dev *dev,

		      struct msix_entry *entries, int minvec, int maxvec)

{

	return -ENOSYS;

}

#else

#ifdef CONFIG_PCI_MSI

int pci_msi_vec_count(struct pci_dev *dev);

int pci_enable_msi_block(struct pci_dev *dev, int nvec);

void pci_msi_shutdown(struct pci_dev *dev);
@@ -1215,6 +1164,27 @@ int pci_msi_enabled(void); 
int pci_enable_msi_range(struct pci_dev *dev, int minvec, int maxvec);

int pci_enable_msix_range(struct pci_dev *dev, struct msix_entry *entries,

			  int minvec, int maxvec);

#else

static inline int pci_msi_vec_count(struct pci_dev *dev) { return -ENOSYS; }

static inline int pci_enable_msi_block(struct pci_dev *dev, int nvec)

{ return -ENOSYS; }

static inline void pci_msi_shutdown(struct pci_dev *dev) { }

static inline void pci_disable_msi(struct pci_dev *dev) { }

static inline int pci_msix_vec_count(struct pci_dev *dev) { return -ENOSYS; }

static inline int pci_enable_msix(struct pci_dev *dev,

				  struct msix_entry *entries, int nvec)

{ return -ENOSYS; }

static inline void pci_msix_shutdown(struct pci_dev *dev) { }

static inline void pci_disable_msix(struct pci_dev *dev) { }

static inline void msi_remove_pci_irq_vectors(struct pci_dev *dev) { }

static inline void pci_restore_msi_state(struct pci_dev *dev) { }

static inline int pci_msi_enabled(void) { return 0; }

static inline int pci_enable_msi_range(struct pci_dev *dev, int minvec,

				       int maxvec)

{ return -ENOSYS; }

static inline int pci_enable_msix_range(struct pci_dev *dev,

		      struct msix_entry *entries, int minvec, int maxvec)

{ return -ENOSYS; }

#endif



#ifdef CONFIG_PCIEPORTBUS
@@ -1225,10 +1195,10 @@ extern bool pcie_ports_auto; 
#define pcie_ports_auto		false

#endif



#ifndef CONFIG_PCIEASPM

static inline bool pcie_aspm_support_enabled(void) { return false; }

#else

#ifdef CONFIG_PCIEASPM

bool pcie_aspm_support_enabled(void);

#else

static inline bool pcie_aspm_support_enabled(void) { return false; }

#endif



#ifdef CONFIG_PCIEAER
@@ -1239,15 +1209,12 @@ static inline void pci_no_aer(void) { } 
static inline bool pci_aer_available(void) { return false; }

#endif



#ifndef CONFIG_PCIE_ECRC

static inline void pcie_set_ecrc_checking(struct pci_dev *dev)

{

	return;

}

static inline void pcie_ecrc_get_policy(char *str) {};

#else

#ifdef CONFIG_PCIE_ECRC

void pcie_set_ecrc_checking(struct pci_dev *dev);

void pcie_ecrc_get_policy(char *str);

#else

static inline void pcie_set_ecrc_checking(struct pci_dev *dev) { }

static inline void pcie_ecrc_get_policy(char *str) { }

#endif



#define pci_enable_msi(pdev)	pci_enable_msi_block(pdev, 1)
@@ -1271,15 +1238,8 @@ void pci_cfg_access_unlock(struct pci_dev *dev); 
extern int pci_domains_supported;

#else

enum { pci_domains_supported = 0 };

static inline int pci_domain_nr(struct pci_bus *bus)

{

	return 0;

}



static inline int pci_proc_domain(struct pci_bus *bus)

{

	return 0;

}

static inline int pci_domain_nr(struct pci_bus *bus) { return 0; }

static inline int pci_proc_domain(struct pci_bus *bus) { return 0; }

#endif /* CONFIG_PCI_DOMAINS */



/* some architectures require additional setup to direct VGA traffic */
@@ -1308,163 +1268,88 @@ _PCI_NOP_ALL(write,) 
static inline struct pci_dev *pci_get_device(unsigned int vendor,

					     unsigned int device,

					     struct pci_dev *from)

{

	return NULL;

}

{ return NULL; }



static inline struct pci_dev *pci_get_subsys(unsigned int vendor,

					     unsigned int device,

					     unsigned int ss_vendor,

					     unsigned int ss_device,

					     struct pci_dev *from)

{

	return NULL;

}

{ return NULL; }



static inline struct pci_dev *pci_get_class(unsigned int class,

					    struct pci_dev *from)

{

	return NULL;

}

{ return NULL; }



#define pci_dev_present(ids)	(0)

#define no_pci_devices()	(1)

#define pci_dev_put(dev)	do { } while (0)



static inline void pci_set_master(struct pci_dev *dev)

{ }



static inline int pci_enable_device(struct pci_dev *dev)

{

	return -EIO;

}



static inline void pci_disable_device(struct pci_dev *dev)

{ }



static inline void pci_set_master(struct pci_dev *dev) { }

static inline int pci_enable_device(struct pci_dev *dev) { return -EIO; }

static inline void pci_disable_device(struct pci_dev *dev) { }

static inline int pci_set_dma_mask(struct pci_dev *dev, u64 mask)

{

	return -EIO;

}



{ return -EIO; }

static inline int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask)

{

	return -EIO;

}



{ return -EIO; }

static inline int pci_set_dma_max_seg_size(struct pci_dev *dev,

					unsigned int size)

{

	return -EIO;

}



{ return -EIO; }

static inline int pci_set_dma_seg_boundary(struct pci_dev *dev,

					unsigned long mask)

{

	return -EIO;

}



{ return -EIO; }

static inline int pci_assign_resource(struct pci_dev *dev, int i)

{

	return -EBUSY;

}



{ return -EBUSY; }

static inline int __pci_register_driver(struct pci_driver *drv,

					struct module *owner)

{

	return 0;

}



{ return 0; }

static inline int pci_register_driver(struct pci_driver *drv)

{

	return 0;

}



static inline void pci_unregister_driver(struct pci_driver *drv)

{ }



{ return 0; }

static inline void pci_unregister_driver(struct pci_driver *drv) { }

static inline int pci_find_capability(struct pci_dev *dev, int cap)

{

	return 0;

}



{ return 0; }

static inline int pci_find_next_capability(struct pci_dev *dev, u8 post,

					   int cap)

{

	return 0;

}



{ return 0; }

static inline int pci_find_ext_capability(struct pci_dev *dev, int cap)

{

	return 0;

}

{ return 0; }



/* Power management related routines */

static inline int pci_save_state(struct pci_dev *dev)

{

	return 0;

}



static inline void pci_restore_state(struct pci_dev *dev)

{ }



static inline int pci_save_state(struct pci_dev *dev) { return 0; }

static inline void pci_restore_state(struct pci_dev *dev) { }

static inline int pci_set_power_state(struct pci_dev *dev, pci_power_t state)

{

	return 0;

}



{ return 0; }

static inline int pci_wake_from_d3(struct pci_dev *dev, bool enable)

{

	return 0;

}



{ return 0; }

static inline pci_power_t pci_choose_state(struct pci_dev *dev,

					   pm_message_t state)

{

	return PCI_D0;

}



{ return PCI_D0; }

static inline int pci_enable_wake(struct pci_dev *dev, pci_power_t state,

				  int enable)

{

	return 0;

}

{ return 0; }



static inline int pci_request_regions(struct pci_dev *dev, const char *res_name)

{

	return -EIO;

}



static inline void pci_release_regions(struct pci_dev *dev)

{ }

{ return -EIO; }

static inline void pci_release_regions(struct pci_dev *dev) { }



#define pci_dma_burst_advice(pdev, strat, strategy_parameter) do { } while (0)



static inline void pci_block_cfg_access(struct pci_dev *dev)

{ }



static inline void pci_block_cfg_access(struct pci_dev *dev) { }

static inline int pci_block_cfg_access_in_atomic(struct pci_dev *dev)

{ return 0; }



static inline void pci_unblock_cfg_access(struct pci_dev *dev)

{ }

static inline void pci_unblock_cfg_access(struct pci_dev *dev) { }



static inline struct pci_bus *pci_find_next_bus(const struct pci_bus *from)

{ return NULL; }



static inline struct pci_dev *pci_get_slot(struct pci_bus *bus,

						unsigned int devfn)

{ return NULL; }



static inline struct pci_dev *pci_get_bus_and_slot(unsigned int bus,

						unsigned int devfn)

{ return NULL; }



static inline int pci_domain_nr(struct pci_bus *bus)

{ return 0; }



static inline struct pci_dev *pci_dev_get(struct pci_dev *dev)

{ return NULL; }

static inline int pci_domain_nr(struct pci_bus *bus) { return 0; }

static inline struct pci_dev *pci_dev_get(struct pci_dev *dev) { return NULL; }



#define dev_is_pci(d) (false)

#define dev_is_pf(d) (false)
@@ -1692,32 +1577,17 @@ int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs); 
int pci_sriov_get_totalvfs(struct pci_dev *dev);

#else

static inline int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn)

{

	return -ENODEV;

}

static inline void pci_disable_sriov(struct pci_dev *dev)

{

}

{ return -ENODEV; }

static inline void pci_disable_sriov(struct pci_dev *dev) { }

static inline irqreturn_t pci_sriov_migration(struct pci_dev *dev)

{

	return IRQ_NONE;

}

static inline int pci_num_vf(struct pci_dev *dev)

{

	return 0;

}

{ return IRQ_NONE; }

static inline int pci_num_vf(struct pci_dev *dev) { return 0; }

static inline int pci_vfs_assigned(struct pci_dev *dev)

{

	return 0;

}

{ return 0; }

static inline int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs)

{

	return 0;

}

{ return 0; }

static inline int pci_sriov_get_totalvfs(struct pci_dev *dev)

{

	return 0;

}

{ return 0; }

#endif



#if defined(CONFIG_HOTPLUG_PCI) || defined(CONFIG_HOTPLUG_PCI_MODULE)