Skip to content

Commit 2ee546c

Browse files
bjorn-helgaasbjorn-helgaas
committed
PCI: Cleanup pci.h whitespace
Put empty or trivial inline stub functions on one line when they fit. No functional change. Signed-off-by: Bjorn Helgaas <[email protected]>
1 parent 4c85980 commit 2ee546c

File tree

1 file changed

+54
-184
lines changed

1 file changed

+54
-184
lines changed

‎include/linux/pci.h‎

Lines changed: 54 additions & 184 deletions
Original file line numberDiff line numberDiff line change
@@ -1165,56 +1165,26 @@ int pci_enable_msi_range(struct pci_dev *dev, int minvec, int maxvec);
11651165
int pci_enable_msix_range(struct pci_dev *dev, struct msix_entry *entries,
11661166
int minvec, int maxvec);
11671167
#else
1168-
static inline int pci_msi_vec_count(struct pci_dev *dev)
1169-
{
1170-
return -ENOSYS;
1171-
}
1172-
1168+
static inline int pci_msi_vec_count(struct pci_dev *dev) { return -ENOSYS; }
11731169
static inline int pci_enable_msi_block(struct pci_dev *dev, int nvec)
1174-
{
1175-
return -ENOSYS;
1176-
}
1177-
1178-
static inline void pci_msi_shutdown(struct pci_dev *dev)
1179-
{ }
1180-
static inline void pci_disable_msi(struct pci_dev *dev)
1181-
{ }
1182-
1183-
static inline int pci_msix_vec_count(struct pci_dev *dev)
1184-
{
1185-
return -ENOSYS;
1186-
}
1170+
{ return -ENOSYS; }
1171+
static inline void pci_msi_shutdown(struct pci_dev *dev) { }
1172+
static inline void pci_disable_msi(struct pci_dev *dev) { }
1173+
static inline int pci_msix_vec_count(struct pci_dev *dev) { return -ENOSYS; }
11871174
static inline int pci_enable_msix(struct pci_dev *dev,
11881175
struct msix_entry *entries, int nvec)
1189-
{
1190-
return -ENOSYS;
1191-
}
1192-
1193-
static inline void pci_msix_shutdown(struct pci_dev *dev)
1194-
{ }
1195-
static inline void pci_disable_msix(struct pci_dev *dev)
1196-
{ }
1197-
1198-
static inline void msi_remove_pci_irq_vectors(struct pci_dev *dev)
1199-
{ }
1200-
1201-
static inline void pci_restore_msi_state(struct pci_dev *dev)
1202-
{ }
1203-
static inline int pci_msi_enabled(void)
1204-
{
1205-
return 0;
1206-
}
1207-
1176+
{ return -ENOSYS; }
1177+
static inline void pci_msix_shutdown(struct pci_dev *dev) { }
1178+
static inline void pci_disable_msix(struct pci_dev *dev) { }
1179+
static inline void msi_remove_pci_irq_vectors(struct pci_dev *dev) { }
1180+
static inline void pci_restore_msi_state(struct pci_dev *dev) { }
1181+
static inline int pci_msi_enabled(void) { return 0; }
12081182
static inline int pci_enable_msi_range(struct pci_dev *dev, int minvec,
12091183
int maxvec)
1210-
{
1211-
return -ENOSYS;
1212-
}
1184+
{ return -ENOSYS; }
12131185
static inline int pci_enable_msix_range(struct pci_dev *dev,
12141186
struct msix_entry *entries, int minvec, int maxvec)
1215-
{
1216-
return -ENOSYS;
1217-
}
1187+
{ return -ENOSYS; }
12181188
#endif
12191189

12201190
#ifdef CONFIG_PCIEPORTBUS
@@ -1243,11 +1213,8 @@ static inline bool pci_aer_available(void) { return false; }
12431213
void pcie_set_ecrc_checking(struct pci_dev *dev);
12441214
void pcie_ecrc_get_policy(char *str);
12451215
#else
1246-
static inline void pcie_set_ecrc_checking(struct pci_dev *dev)
1247-
{
1248-
return;
1249-
}
1250-
static inline void pcie_ecrc_get_policy(char *str) {};
1216+
static inline void pcie_set_ecrc_checking(struct pci_dev *dev) { }
1217+
static inline void pcie_ecrc_get_policy(char *str) { }
12511218
#endif
12521219

12531220
#define pci_enable_msi(pdev) pci_enable_msi_block(pdev, 1)
@@ -1271,15 +1238,8 @@ void pci_cfg_access_unlock(struct pci_dev *dev);
12711238
extern int pci_domains_supported;
12721239
#else
12731240
enum { pci_domains_supported = 0 };
1274-
static inline int pci_domain_nr(struct pci_bus *bus)
1275-
{
1276-
return 0;
1277-
}
1278-
1279-
static inline int pci_proc_domain(struct pci_bus *bus)
1280-
{
1281-
return 0;
1282-
}
1241+
static inline int pci_domain_nr(struct pci_bus *bus) { return 0; }
1242+
static inline int pci_proc_domain(struct pci_bus *bus) { return 0; }
12831243
#endif /* CONFIG_PCI_DOMAINS */
12841244

12851245
/* some architectures require additional setup to direct VGA traffic */
@@ -1308,163 +1268,88 @@ _PCI_NOP_ALL(write,)
13081268
static inline struct pci_dev *pci_get_device(unsigned int vendor,
13091269
unsigned int device,
13101270
struct pci_dev *from)
1311-
{
1312-
return NULL;
1313-
}
1271+
{ return NULL; }
13141272

13151273
static inline struct pci_dev *pci_get_subsys(unsigned int vendor,
13161274
unsigned int device,
13171275
unsigned int ss_vendor,
13181276
unsigned int ss_device,
13191277
struct pci_dev *from)
1320-
{
1321-
return NULL;
1322-
}
1278+
{ return NULL; }
13231279

13241280
static inline struct pci_dev *pci_get_class(unsigned int class,
13251281
struct pci_dev *from)
1326-
{
1327-
return NULL;
1328-
}
1282+
{ return NULL; }
13291283

13301284
#define pci_dev_present(ids) (0)
13311285
#define no_pci_devices() (1)
13321286
#define pci_dev_put(dev) do { } while (0)
13331287

1334-
static inline void pci_set_master(struct pci_dev *dev)
1335-
{ }
1336-
1337-
static inline int pci_enable_device(struct pci_dev *dev)
1338-
{
1339-
return -EIO;
1340-
}
1341-
1342-
static inline void pci_disable_device(struct pci_dev *dev)
1343-
{ }
1344-
1288+
static inline void pci_set_master(struct pci_dev *dev) { }
1289+
static inline int pci_enable_device(struct pci_dev *dev) { return -EIO; }
1290+
static inline void pci_disable_device(struct pci_dev *dev) { }
13451291
static inline int pci_set_dma_mask(struct pci_dev *dev, u64 mask)
1346-
{
1347-
return -EIO;
1348-
}
1349-
1292+
{ return -EIO; }
13501293
static inline int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask)
1351-
{
1352-
return -EIO;
1353-
}
1354-
1294+
{ return -EIO; }
13551295
static inline int pci_set_dma_max_seg_size(struct pci_dev *dev,
13561296
unsigned int size)
1357-
{
1358-
return -EIO;
1359-
}
1360-
1297+
{ return -EIO; }
13611298
static inline int pci_set_dma_seg_boundary(struct pci_dev *dev,
13621299
unsigned long mask)
1363-
{
1364-
return -EIO;
1365-
}
1366-
1300+
{ return -EIO; }
13671301
static inline int pci_assign_resource(struct pci_dev *dev, int i)
1368-
{
1369-
return -EBUSY;
1370-
}
1371-
1302+
{ return -EBUSY; }
13721303
static inline int __pci_register_driver(struct pci_driver *drv,
13731304
struct module *owner)
1374-
{
1375-
return 0;
1376-
}
1377-
1305+
{ return 0; }
13781306
static inline int pci_register_driver(struct pci_driver *drv)
1379-
{
1380-
return 0;
1381-
}
1382-
1383-
static inline void pci_unregister_driver(struct pci_driver *drv)
1384-
{ }
1385-
1307+
{ return 0; }
1308+
static inline void pci_unregister_driver(struct pci_driver *drv) { }
13861309
static inline int pci_find_capability(struct pci_dev *dev, int cap)
1387-
{
1388-
return 0;
1389-
}
1390-
1310+
{ return 0; }
13911311
static inline int pci_find_next_capability(struct pci_dev *dev, u8 post,
13921312
int cap)
1393-
{
1394-
return 0;
1395-
}
1396-
1313+
{ return 0; }
13971314
static inline int pci_find_ext_capability(struct pci_dev *dev, int cap)
1398-
{
1399-
return 0;
1400-
}
1315+
{ return 0; }
14011316

14021317
/* Power management related routines */
1403-
static inline int pci_save_state(struct pci_dev *dev)
1404-
{
1405-
return 0;
1406-
}
1407-
1408-
static inline void pci_restore_state(struct pci_dev *dev)
1409-
{ }
1410-
1318+
static inline int pci_save_state(struct pci_dev *dev) { return 0; }
1319+
static inline void pci_restore_state(struct pci_dev *dev) { }
14111320
static inline int pci_set_power_state(struct pci_dev *dev, pci_power_t state)
1412-
{
1413-
return 0;
1414-
}
1415-
1321+
{ return 0; }
14161322
static inline int pci_wake_from_d3(struct pci_dev *dev, bool enable)
1417-
{
1418-
return 0;
1419-
}
1420-
1323+
{ return 0; }
14211324
static inline pci_power_t pci_choose_state(struct pci_dev *dev,
14221325
pm_message_t state)
1423-
{
1424-
return PCI_D0;
1425-
}
1426-
1326+
{ return PCI_D0; }
14271327
static inline int pci_enable_wake(struct pci_dev *dev, pci_power_t state,
14281328
int enable)
1429-
{
1430-
return 0;
1431-
}
1329+
{ return 0; }
14321330

14331331
static inline int pci_request_regions(struct pci_dev *dev, const char *res_name)
1434-
{
1435-
return -EIO;
1436-
}
1437-
1438-
static inline void pci_release_regions(struct pci_dev *dev)
1439-
{ }
1332+
{ return -EIO; }
1333+
static inline void pci_release_regions(struct pci_dev *dev) { }
14401334

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

1443-
static inline void pci_block_cfg_access(struct pci_dev *dev)
1444-
{ }
1445-
1337+
static inline void pci_block_cfg_access(struct pci_dev *dev) { }
14461338
static inline int pci_block_cfg_access_in_atomic(struct pci_dev *dev)
14471339
{ return 0; }
1448-
1449-
static inline void pci_unblock_cfg_access(struct pci_dev *dev)
1450-
{ }
1340+
static inline void pci_unblock_cfg_access(struct pci_dev *dev) { }
14511341

14521342
static inline struct pci_bus *pci_find_next_bus(const struct pci_bus *from)
14531343
{ return NULL; }
1454-
14551344
static inline struct pci_dev *pci_get_slot(struct pci_bus *bus,
14561345
unsigned int devfn)
14571346
{ return NULL; }
1458-
14591347
static inline struct pci_dev *pci_get_bus_and_slot(unsigned int bus,
14601348
unsigned int devfn)
14611349
{ return NULL; }
14621350

1463-
static inline int pci_domain_nr(struct pci_bus *bus)
1464-
{ return 0; }
1465-
1466-
static inline struct pci_dev *pci_dev_get(struct pci_dev *dev)
1467-
{ return NULL; }
1351+
static inline int pci_domain_nr(struct pci_bus *bus) { return 0; }
1352+
static inline struct pci_dev *pci_dev_get(struct pci_dev *dev) { return NULL; }
14681353

14691354
#define dev_is_pci(d) (false)
14701355
#define dev_is_pf(d) (false)
@@ -1620,7 +1505,7 @@ struct pci_dev *pci_get_dma_source(struct pci_dev *dev);
16201505
int pci_dev_specific_acs_enabled(struct pci_dev *dev, u16 acs_flags);
16211506
#else
16221507
static inline void pci_fixup_device(enum pci_fixup_pass pass,
1623-
struct pci_dev *dev) {}
1508+
struct pci_dev *dev) { }
16241509
static inline struct pci_dev *pci_get_dma_source(struct pci_dev *dev)
16251510
{
16261511
return pci_dev_get(dev);
@@ -1692,32 +1577,17 @@ int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs);
16921577
int pci_sriov_get_totalvfs(struct pci_dev *dev);
16931578
#else
16941579
static inline int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn)
1695-
{
1696-
return -ENODEV;
1697-
}
1698-
static inline void pci_disable_sriov(struct pci_dev *dev)
1699-
{
1700-
}
1580+
{ return -ENODEV; }
1581+
static inline void pci_disable_sriov(struct pci_dev *dev) { }
17011582
static inline irqreturn_t pci_sriov_migration(struct pci_dev *dev)
1702-
{
1703-
return IRQ_NONE;
1704-
}
1705-
static inline int pci_num_vf(struct pci_dev *dev)
1706-
{
1707-
return 0;
1708-
}
1583+
{ return IRQ_NONE; }
1584+
static inline int pci_num_vf(struct pci_dev *dev) { return 0; }
17091585
static inline int pci_vfs_assigned(struct pci_dev *dev)
1710-
{
1711-
return 0;
1712-
}
1586+
{ return 0; }
17131587
static inline int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs)
1714-
{
1715-
return 0;
1716-
}
1588+
{ return 0; }
17171589
static inline int pci_sriov_get_totalvfs(struct pci_dev *dev)
1718-
{
1719-
return 0;
1720-
}
1590+
{ return 0; }
17211591
#endif
17221592

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

0 commit comments

Comments
 (0)