Merge tag 'm68knommu-for-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

torvalds · torvalds · commit 7a1415eebeec · 2023-09-04T11:34:33.000-07:00
Pull m68knommu updates from Greg Ungerer:
 "Two changes, one a trivial white space clean up, the other removes the
  unnecessary local pcibios_setup() code"

* tag 'm68knommu-for-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: coldfire: dma_timer: ERROR: "foo __init bar" should be "foo __init bar"
  m68k/pci: Drop useless pcibios_setup()
diff --git a/arch/m68k/coldfire/dma_timer.c b/arch/m68k/coldfire/dma_timer.c
@@ -48,7 +48,7 @@ static struct clocksource clocksource_cf_dt = {
 	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
-static int __init  init_cf_dt_clocksource(void)
+static int __init init_cf_dt_clocksource(void)
 {
 	/*
 	 * We setup DMA timer 0 in free run mode. This incrementing counter is
diff --git a/arch/m68k/kernel/pcibios.c b/arch/m68k/kernel/pcibios.c
@@ -92,9 +92,3 @@ void pcibios_fixup_bus(struct pci_bus *bus)
 		pci_write_config_byte(dev, PCI_LATENCY_TIMER, 32);
 	}
 }
-
-char *pcibios_setup(char *str)
-{
-	return str;
-}
-

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ static struct clocksource clocksource_cf_dt = {`
`48`	`48`	`.flags = CLOCK_SOURCE_IS_CONTINUOUS,`
`49`	`49`	`};`
`50`	`50`
`51`		`-static int __init init_cf_dt_clocksource(void)`
	`51`	`+static int __init init_cf_dt_clocksource(void)`
`52`	`52`	`{`
`53`	`53`	`/*`
`54`	`54`	`* We setup DMA timer 0 in free run mode. This incrementing counter is`
Original file line number	Diff line number	Diff line change
`@@ -92,9 +92,3 @@ void pcibios_fixup_bus(struct pci_bus *bus)`
`92`	`92`	`pci_write_config_byte(dev, PCI_LATENCY_TIMER, 32);`
`93`	`93`	`}`
`94`	`94`	`}`
`95`		`-`
`96`		`-char pcibios_setup(char str)`
`97`		`-{`
`98`		`- return str;`
`99`		`-}`
`100`		`-`