Linux-PCI Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH] x86/PCI: Remove surplus return from a void function
@ 2019-08-20  6:51 Krzysztof Wilczynski
  2019-08-20  9:34 ` Andrew Murray
  2019-08-23  1:36 ` [tip: x86/cleanups] x86/PCI: Remove superfluous returns from void functions tip-bot2 for Krzysztof Wilczynski
  0 siblings, 2 replies; 3+ messages in thread
From: Krzysztof Wilczynski @ 2019-08-20  6:51 UTC (permalink / raw)
  To: Bjorn Helgaas
  Cc: Thomas Gleixner, Ingo Molnar, Borislav Petkov, H. Peter Anvin,
	x86, linux-pci, linux-kernel

Remove unnecessary empty return statement at the end of a void
function in the arch/x86/kernel/quirks.c.

Signed-off-by: Krzysztof Wilczynski <kw@linux.com>
---
 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 8451f38ad399..1daf8f2aa21f 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);
-- 
2.22.1


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] x86/PCI: Remove surplus return from a void function
  2019-08-20  6:51 [PATCH] x86/PCI: Remove surplus return from a void function Krzysztof Wilczynski
@ 2019-08-20  9:34 ` Andrew Murray
  2019-08-23  1:36 ` [tip: x86/cleanups] x86/PCI: Remove superfluous returns from void functions tip-bot2 for Krzysztof Wilczynski
  1 sibling, 0 replies; 3+ messages in thread
From: Andrew Murray @ 2019-08-20  9:34 UTC (permalink / raw)
  To: Krzysztof Wilczynski
  Cc: Bjorn Helgaas, Thomas Gleixner, Ingo Molnar, Borislav Petkov,
	H. Peter Anvin, x86, linux-pci, linux-kernel

On Tue, Aug 20, 2019 at 08:51:21AM +0200, Krzysztof Wilczynski wrote:
> Remove unnecessary empty return statement at the end of a void
> function in the arch/x86/kernel/quirks.c.
> 
> Signed-off-by: Krzysztof Wilczynski <kw@linux.com>
> ---
>  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 8451f38ad399..1daf8f2aa21f 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);
> -- 

Reviewed-by: Andrew Murray <andrew.murray@arm.com>

> 2.22.1
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [tip: x86/cleanups] x86/PCI: Remove superfluous returns from void functions
  2019-08-20  6:51 [PATCH] x86/PCI: Remove surplus return from a void function Krzysztof Wilczynski
  2019-08-20  9:34 ` Andrew Murray
@ 2019-08-23  1:36 ` tip-bot2 for Krzysztof Wilczynski
  1 sibling, 0 replies; 3+ messages in thread
From: tip-bot2 for Krzysztof Wilczynski @ 2019-08-23  1:36 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: linux-kernel, x86-ml, Thomas Gleixner, linux-pci, Ingo Molnar,
	H. Peter Anvin, Bjorn Helgaas, Borislav Petkov,
	Krzysztof Wilczynski

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@linux.com>
AuthorDate:    Tue, 20 Aug 2019 08:51:21 +02:00
Committer:     Borislav Petkov <bp@suse.de>
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@linux.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Bjorn Helgaas <helgaas@kernel.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: linux-pci@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: x86-ml <x86@kernel.org>
Link: https://lkml.kernel.org/r/20190820065121.16594-1-kw@linux.com
---
 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);

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-20  6:51 [PATCH] x86/PCI: Remove surplus return from a void function Krzysztof Wilczynski
2019-08-20  9:34 ` Andrew Murray
2019-08-23  1:36 ` [tip: x86/cleanups] x86/PCI: Remove superfluous returns from void functions tip-bot2 for Krzysztof Wilczynski

Linux-PCI Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-pci/0 linux-pci/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-pci linux-pci/ https://lore.kernel.org/linux-pci \
		linux-pci@vger.kernel.org linux-pci@archiver.kernel.org
	public-inbox-index linux-pci


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-pci


AGPL code for this site: git clone https://public-inbox.org/ public-inbox