The following commit has been merged into the x86/cleanups branch of tip: Commit-ID: f25896ebfe0cf818ebd1adb5e6a05dc40b820e45 Gitweb: https://git.kernel.org/tip/f25896ebfe0cf818ebd1adb5e6a05dc40b820e45 Author: Krzysztof Wilczynski <kw@xxxxxxxxx> AuthorDate: Tue, 20 Aug 2019 08:51:21 +02:00 Committer: Borislav Petkov <bp@xxxxxxx> CommitterDate: Tue, 20 Aug 2019 09:54:36 +02:00 x86/PCI: Remove superfluous returns from void functions Remove unnecessary empty return statements at the end of void functions in arch/x86/kernel/quirks.c. Signed-off-by: Krzysztof Wilczynski <kw@xxxxxxxxx> Signed-off-by: Borislav Petkov <bp@xxxxxxx> Cc: Bjorn Helgaas <helgaas@xxxxxxxxxx> Cc: "H. Peter Anvin" <hpa@xxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxxxxx> Cc: linux-pci@xxxxxxxxxxxxxxx Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: x86-ml <x86@xxxxxxxxxx> Link: https://lkml.kernel.org/r/20190820065121.16594-1-kw@xxxxxxxxx --- arch/x86/kernel/quirks.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c index 8451f38..1daf8f2 100644 --- a/arch/x86/kernel/quirks.c +++ b/arch/x86/kernel/quirks.c @@ -90,8 +90,6 @@ static void ich_force_hpet_resume(void) BUG(); else printk(KERN_DEBUG "Force enabled HPET at resume\n"); - - return; } static void ich_force_enable_hpet(struct pci_dev *dev) @@ -448,7 +446,6 @@ static void nvidia_force_enable_hpet(struct pci_dev *dev) dev_printk(KERN_DEBUG, &dev->dev, "Force enabled HPET at 0x%lx\n", force_hpet_address); cached_dev = dev; - return; } /* ISA Bridges */ @@ -513,7 +510,6 @@ static void e6xx_force_enable_hpet(struct pci_dev *dev) force_hpet_resume_type = NONE_FORCE_HPET_RESUME; dev_printk(KERN_DEBUG, &dev->dev, "Force enabled HPET at " "0x%lx\n", force_hpet_address); - return; } DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_E6XX_CU, e6xx_force_enable_hpet);
