diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2019-09-23 16:10:31 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2019-09-23 16:10:31 -0500 |
| commit | c5048a73b4770304699cb15e3ffcb97acab685f7 (patch) | |
| tree | b6e8a8676251a835fcf1f0f927d0182e6ff63be2 /drivers/pci/hotplug/cpqphp_nvram.h | |
| parent | cdc7e184abb338dfe24624e90b09d366f0dcfad5 (diff) | |
| parent | 55507aea58824578610eb0cb5c250a0c997987c9 (diff) | |
| download | linux-c5048a73b4770304699cb15e3ffcb97acab685f7.tar.bz2 | |
Merge branch 'pci/trivial'
- Fix typos and whitespace errors (Bjorn Helgaas, Krzysztof Wilczynski)
- Remove unnecessary "return" statements (Krzysztof Wilczynski)
- Correct of_irq_parse_pci() function documentation (Lubomir Rintel)
* pci/trivial:
PCI: Remove unnecessary returns
PCI: OF: Correct of_irq_parse_pci() documentation
PCI: Fix typos and whitespace errors
Diffstat (limited to 'drivers/pci/hotplug/cpqphp_nvram.h')
| -rw-r--r-- | drivers/pci/hotplug/cpqphp_nvram.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/pci/hotplug/cpqphp_nvram.h b/drivers/pci/hotplug/cpqphp_nvram.h index 918ff8dbfe62..70e879b6a23f 100644 --- a/drivers/pci/hotplug/cpqphp_nvram.h +++ b/drivers/pci/hotplug/cpqphp_nvram.h @@ -16,10 +16,7 @@ #ifndef CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM -static inline void compaq_nvram_init(void __iomem *rom_start) -{ - return; -} +static inline void compaq_nvram_init(void __iomem *rom_start) { } static inline int compaq_nvram_load(void __iomem *rom_start, struct controller *ctrl) { |