lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PCI: fix codingstyle issues in include/linux/pci.h

Browse Source 
Fixes a number of coding style issues in pci.h.
It's a tad more readable now...

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman
2008-01-30 15:21:33 -08:00
parent 367b09fec4
commit 05cca6e52a
1 changed files with 236 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

257
include/linux/pci.h
View File

@@ -351,8 +351,7 @@ enum pci_ers_result {
}; };
/* PCI bus error event callbacks */ /* PCI bus error event callbacks */
struct pci_error_handlers struct pci_error_handlers {
{
/* PCI bus error detected on this device */ /* PCI bus error detected on this device */
pci_ers_result_t (*error_detected)(struct pci_dev *dev, pci_ers_result_t (*error_detected)(struct pci_dev *dev,
enum pci_channel_state error); enum pci_channel_state error);
@@ -459,8 +458,10 @@ void pcibios_update_irq(struct pci_dev *, int irq);
extern struct pci_bus *pci_find_bus(int domain, int busnr); extern struct pci_bus *pci_find_bus(int domain, int busnr);
void pci_bus_add_devices(struct pci_bus *bus); void pci_bus_add_devices(struct pci_bus *bus);
struct pci_bus *pci_scan_bus_parented(struct device *parent, int bus, struct pci_ops *ops, void *sysdata); struct pci_bus *pci_scan_bus_parented(struct device *parent, int bus,
static inline struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops, void *sysdata) struct pci_ops *ops, void *sysdata);
static inline struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops,
void *sysdata)
{ {
struct pci_bus *root_bus; struct pci_bus *root_bus;
root_bus = pci_scan_bus_parented(NULL, bus, ops, sysdata); root_bus = pci_scan_bus_parented(NULL, bus, ops, sysdata);
@@ -468,15 +469,18 @@ static inline struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops, void *s
pci_bus_add_devices(root_bus); pci_bus_add_devices(root_bus);
return root_bus; return root_bus;
} }
struct pci_bus *pci_create_bus(struct device *parent, int bus, struct pci_ops *ops, void *sysdata); struct pci_bus *pci_create_bus(struct device *parent, int bus,
struct pci_bus * pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev, int busnr); struct pci_ops *ops, void *sysdata);
struct pci_bus *pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev,
int busnr);
int pci_scan_slot(struct pci_bus *bus, int devfn); int pci_scan_slot(struct pci_bus *bus, int devfn);
struct pci_dev *pci_scan_single_device(struct pci_bus *bus, int devfn); struct pci_dev *pci_scan_single_device(struct pci_bus *bus, int devfn);
void pci_device_add(struct pci_dev *dev, struct pci_bus *bus); void pci_device_add(struct pci_dev *dev, struct pci_bus *bus);
unsigned int pci_scan_child_bus(struct pci_bus *bus); unsigned int pci_scan_child_bus(struct pci_bus *bus);
int __must_check pci_bus_add_device(struct pci_dev *dev); int __must_check pci_bus_add_device(struct pci_dev *dev);
void pci_read_bridge_bases(struct pci_bus *child); void pci_read_bridge_bases(struct pci_bus *child);
struct resource *pci_find_parent_resource(const struct pci_dev *dev, struct resource *res); struct resource *pci_find_parent_resource(const struct pci_dev *dev,
struct resource *res);
int pci_get_interrupt_pin(struct pci_dev *dev, struct pci_dev **bridge); int pci_get_interrupt_pin(struct pci_dev *dev, struct pci_dev **bridge);
extern struct pci_dev *pci_dev_get(struct pci_dev *dev); extern struct pci_dev *pci_dev_get(struct pci_dev *dev);
extern void pci_dev_put(struct pci_dev *dev); extern void pci_dev_put(struct pci_dev *dev);
@@ -489,8 +493,11 @@ extern void pci_sort_breadthfirst(void);
/* Generic PCI functions exported to card drivers */ /* Generic PCI functions exported to card drivers */
#ifdef CONFIG_PCI_LEGACY #ifdef CONFIG_PCI_LEGACY
struct pci_dev __deprecated *pci_find_device (unsigned int vendor, unsigned int device, const struct pci_dev *from); struct pci_dev __deprecated *pci_find_device(unsigned int vendor,
struct pci_dev __deprecated *pci_find_slot (unsigned int bus, unsigned int devfn); unsigned int device,
const struct pci_dev *from);
struct pci_dev __deprecated *pci_find_slot(unsigned int bus,
unsigned int devfn);
#endif /* CONFIG_PCI_LEGACY */ #endif /* CONFIG_PCI_LEGACY */
int pci_find_capability(struct pci_dev *dev, int cap); int pci_find_capability(struct pci_dev *dev, int cap);
@@ -515,12 +522,18 @@ struct pci_dev *pci_get_class (unsigned int class, struct pci_dev *from);
int pci_dev_present(const struct pci_device_id *ids); int pci_dev_present(const struct pci_device_id *ids);
const struct pci_device_id *pci_find_present(const struct pci_device_id *ids); const struct pci_device_id *pci_find_present(const struct pci_device_id *ids);
int pci_bus_read_config_byte (struct pci_bus *bus, unsigned int devfn, int where, u8 *val); int pci_bus_read_config_byte(struct pci_bus *bus, unsigned int devfn,
int pci_bus_read_config_word (struct pci_bus *bus, unsigned int devfn, int where, u16 *val); int where, u8 *val);
int pci_bus_read_config_dword (struct pci_bus *bus, unsigned int devfn, int where, u32 *val); int pci_bus_read_config_word(struct pci_bus *bus, unsigned int devfn,
int pci_bus_write_config_byte (struct pci_bus *bus, unsigned int devfn, int where, u8 val); int where, u16 *val);
int pci_bus_write_config_word (struct pci_bus *bus, unsigned int devfn, int where, u16 val); int pci_bus_read_config_dword(struct pci_bus *bus, unsigned int devfn,
int pci_bus_write_config_dword (struct pci_bus *bus, unsigned int devfn, int where, u32 val); int where, u32 *val);
int pci_bus_write_config_byte(struct pci_bus *bus, unsigned int devfn,
int where, u8 val);
int pci_bus_write_config_word(struct pci_bus *bus, unsigned int devfn,
int where, u16 val);
int pci_bus_write_config_dword(struct pci_bus *bus, unsigned int devfn,
int where, u32 val);
static inline int pci_read_config_byte(struct pci_dev *dev, int where, u8 *val) static inline int pci_read_config_byte(struct pci_dev *dev, int where, u8 *val)
{ {
@@ -530,7 +543,8 @@ static inline int pci_read_config_word(struct pci_dev *dev, int where, u16 *val)
{ {
return pci_bus_read_config_word(dev->bus, dev->devfn, where, val); return pci_bus_read_config_word(dev->bus, dev->devfn, where, val);
} }
static inline int pci_read_config_dword(struct pci_dev *dev, int where, u32 *val) static inline int pci_read_config_dword(struct pci_dev *dev, int where,
u32 *val)
{ {
return pci_bus_read_config_dword(dev->bus, dev->devfn, where, val); return pci_bus_read_config_dword(dev->bus, dev->devfn, where, val);
} }
@@ -542,7 +556,8 @@ static inline int pci_write_config_word(struct pci_dev *dev, int where, u16 val)
{ {
return pci_bus_write_config_word(dev->bus, dev->devfn, where, val); return pci_bus_write_config_word(dev->bus, dev->devfn, where, val);
} }
static inline int pci_write_config_dword(struct pci_dev *dev, int where, u32 val) static inline int pci_write_config_dword(struct pci_dev *dev, int where,
u32 val)
{ {
return pci_bus_write_config_dword(dev->bus, dev->devfn, where, val); return pci_bus_write_config_dword(dev->bus, dev->devfn, where, val);
} }
@@ -630,11 +645,13 @@ static inline int __must_check pci_register_driver(struct pci_driver *driver)
return __pci_register_driver(driver, THIS_MODULE, KBUILD_MODNAME); return __pci_register_driver(driver, THIS_MODULE, KBUILD_MODNAME);
} }
void pci_unregister_driver(struct pci_driver *); void pci_unregister_driver(struct pci_driver *dev);
void pci_remove_behind_bridge(struct pci_dev *); void pci_remove_behind_bridge(struct pci_dev *dev);
struct pci_driver *pci_dev_driver(const struct pci_dev *); struct pci_driver *pci_dev_driver(const struct pci_dev *dev);
const struct pci_device_id *pci_match_id(const struct pci_device_id *ids, struct pci_dev *dev); const struct pci_device_id *pci_match_id(const struct pci_device_id *ids,
int pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max, int pass); struct pci_dev *dev);
int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max,
int pass);
void pci_walk_bus(struct pci_bus *top, void (*cb)(struct pci_dev *, void *), void pci_walk_bus(struct pci_bus *top, void (*cb)(struct pci_dev *, void *),
void *userdata); void *userdata);
@@ -668,13 +685,28 @@ struct msix_entry {
#ifndef CONFIG_PCI_MSI #ifndef CONFIG_PCI_MSI
static inline int pci_enable_msi(struct pci_dev *dev) {return -1;} static inline int pci_enable_msi(struct pci_dev *dev)
static inline void pci_disable_msi(struct pci_dev *dev) {} {
return -1;
}
static inline void pci_disable_msi(struct pci_dev *dev)
{ }
static inline int pci_enable_msix(struct pci_dev *dev, static inline int pci_enable_msix(struct pci_dev *dev,
struct msix_entry *entries, int nvec) {return -1;} struct msix_entry *entries, int nvec)
static inline void pci_disable_msix(struct pci_dev *dev) {} {
static inline void msi_remove_pci_irq_vectors(struct pci_dev *dev) {} return -1;
static inline void pci_restore_msi_state(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)
{ }
#else #else
extern int pci_enable_msi(struct pci_dev *dev); extern int pci_enable_msi(struct pci_dev *dev);
extern void pci_disable_msi(struct pci_dev *dev); extern void pci_disable_msi(struct pci_dev *dev);
@@ -703,7 +735,11 @@ extern void pci_unblock_user_cfg_access(struct pci_dev *dev);
extern int pci_domains_supported; extern int pci_domains_supported;
#else #else
enum { pci_domains_supported = 0 }; enum { pci_domains_supported = 0 };
static inline int pci_domain_nr(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) static inline int pci_proc_domain(struct pci_bus *bus)
{ {
return 0; return 0;
@@ -718,67 +754,160 @@ static inline int pci_proc_domain(struct pci_bus *bus)
*/ */
#define _PCI_NOP(o, s, t) \ #define _PCI_NOP(o, s, t) \
static inline int pci_##o##_config_##s (struct pci_dev *dev, int where, t val) \ static inline int pci_##o##_config_##s(struct pci_dev *dev, \
int where, t val) \
{ return PCIBIOS_FUNC_NOT_SUPPORTED; } { return PCIBIOS_FUNC_NOT_SUPPORTED; }
#define _PCI_NOP_ALL(o, x) _PCI_NOP(o, byte, u8 x) \ #define _PCI_NOP_ALL(o, x) _PCI_NOP(o, byte, u8 x) \
_PCI_NOP(o, word, u16 x) \ _PCI_NOP(o, word, u16 x) \
_PCI_NOP(o, dword, u32 x) _PCI_NOP(o, dword, u32 x)
_PCI_NOP_ALL(read, *) _PCI_NOP_ALL(read, *)
_PCI_NOP_ALL(write,) _PCI_NOP_ALL(write,)
static inline struct pci_dev *pci_find_device(unsigned int vendor, unsigned int device, const struct pci_dev *from) static inline struct pci_dev *pci_find_device(unsigned int vendor,
{ return NULL; } unsigned int device,
const struct pci_dev *from)
{
return NULL;
}
static inline struct pci_dev *pci_find_slot(unsigned int bus, unsigned int devfn) static inline struct pci_dev *pci_find_slot(unsigned int bus,
{ return NULL; } unsigned int devfn)
{
return NULL;
}
static inline struct pci_dev *pci_get_device(unsigned int vendor, static inline struct pci_dev *pci_get_device(unsigned int vendor,
unsigned int device, struct pci_dev *from) unsigned int device,
{ return NULL; } struct pci_dev *from)
{
return NULL;
}
static inline struct pci_dev *pci_get_device_reverse(unsigned int vendor, static inline struct pci_dev *pci_get_device_reverse(unsigned int vendor,
unsigned int device, struct pci_dev *from) unsigned int device,
{ return NULL; } struct pci_dev *from)
{
return NULL;
}
static inline struct pci_dev *pci_get_subsys (unsigned int vendor, unsigned int device, static inline struct pci_dev *pci_get_subsys(unsigned int vendor,
unsigned int ss_vendor, unsigned int ss_device, struct pci_dev *from) unsigned int device,
{ return NULL; } unsigned int ss_vendor,
unsigned int ss_device,
struct pci_dev *from)
{
return NULL;
}
static inline struct pci_dev *pci_get_class(unsigned int class, struct pci_dev *from) static inline struct pci_dev *pci_get_class(unsigned int class,
{ return NULL; } struct pci_dev *from)
{
return NULL;
}
#define pci_dev_present(ids) (0) #define pci_dev_present(ids) (0)
#define no_pci_devices() (1) #define no_pci_devices() (1)
#define pci_find_present(ids) (NULL) #define pci_find_present(ids) (NULL)
#define pci_dev_put(dev) do { } while (0) #define pci_dev_put(dev) do { } while (0)
static inline void pci_set_master(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; } static inline int pci_enable_device(struct pci_dev *dev)
static inline int pci_assign_resource(struct pci_dev *dev, int i) { return -EBUSY;} {
static inline int __pci_register_driver(struct pci_driver *drv, struct module *owner) { return 0;} return -EIO;
static inline int pci_register_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; } static inline void pci_disable_device(struct pci_dev *dev)
static inline int pci_find_next_capability (struct pci_dev *dev, u8 post, int cap) { return 0; } { }
static inline int pci_find_ext_capability (struct pci_dev *dev, int cap) {return 0; }
static inline void pcie_wait_pending_transaction(struct pci_dev *dev) {} static inline int pci_set_dma_mask(struct pci_dev *dev, u64 mask)
{
return -EIO;
}
static inline int pci_assign_resource(struct pci_dev *dev, int i)
{
return -EBUSY;
}
static inline int __pci_register_driver(struct pci_driver *drv,
struct module *owner)
{
return 0;
}
static inline int pci_register_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;
}
static inline int pci_find_next_capability(struct pci_dev *dev, u8 post,
int cap)
{
return 0;
}
static inline int pci_find_ext_capability(struct pci_dev *dev, int cap)
{
return 0;
}
static inline void pcie_wait_pending_transaction(struct pci_dev *dev)
{ }
/* Power management related routines */ /* Power management related routines */
static inline int pci_save_state(struct pci_dev *dev) { return 0; } static inline int pci_save_state(struct pci_dev *dev)
static inline int pci_restore_state(struct pci_dev *dev) { return 0; } {
static inline int pci_set_power_state(struct pci_dev *dev, pci_power_t state) { return 0; } return 0;
static inline pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state) { return PCI_D0; } }
static inline int pci_enable_wake(struct pci_dev *dev, pci_power_t state, int enable) { return 0; }
static inline int pci_request_regions(struct pci_dev *dev, const char *res_name) { return -EIO; } static inline int pci_restore_state(struct pci_dev *dev)
static inline void pci_release_regions(struct pci_dev *dev) { } {
return 0;
}
static inline int pci_set_power_state(struct pci_dev *dev, pci_power_t state)
{
return 0;
}
static inline pci_power_t pci_choose_state(struct pci_dev *dev,
pm_message_t state)
{
return PCI_D0;
}
static inline int pci_enable_wake(struct pci_dev *dev, pci_power_t state,
int enable)
{
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)
{ }
#define pci_dma_burst_advice(pdev, strat, strategy_parameter) do { } while (0) #define pci_dma_burst_advice(pdev, strat, strategy_parameter) do { } while (0)
static inline void pci_block_user_cfg_access(struct pci_dev *dev) { } static inline void pci_block_user_cfg_access(struct pci_dev *dev)
static inline void pci_unblock_user_cfg_access(struct pci_dev *dev) { } { }
static inline void pci_unblock_user_cfg_access(struct pci_dev *dev)
{ }
static inline struct pci_bus *pci_find_next_bus(const struct pci_bus *from) static inline struct pci_bus *pci_find_next_bus(const struct pci_bus *from)
{ return NULL; } { return NULL; }