Commit 894554c1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'driver-core-5.5-rc2' of git://

Pull driver core fixes from Greg KH:
 "Here are two small driver core fixes to resolve some reported issues

  The first is to handle the much-reported (by the build systems)
  problem that superH does not boot anymore.

  The second handles an issue in the new platform logic that a number of
  people ran into with the automated tests in kbuild

  Both of these have been in linux-next with no reported issues"

* tag 'driver-core-5.5-rc2' of git://
  drivers: Fix boot problem on SuperH
  of/platform: Unconditionally pause/resume sync state during kernel init
parents aff2a525 eecd37e1
......@@ -325,9 +325,9 @@ int __init sh_early_platform_driver_probe(char *class_str,
* sh_early_platform_cleanup - clean up early platform code
* early_platform_cleanup - clean up early platform code
static int __init sh_early_platform_cleanup(void)
void __init early_platform_cleanup(void)
struct platform_device *pd, *pd2;
......@@ -337,11 +337,4 @@ static int __init sh_early_platform_cleanup(void)
memset(&pd->dev.devres_head, 0, sizeof(pd->dev.devres_head));
return 0;
* This must happen once after all early devices are probed but before probing
* real platform devices.
......@@ -1325,10 +1325,14 @@ struct device *platform_find_device_by_driver(struct device *start,
void __weak __init early_platform_cleanup(void) { }
int __init platform_bus_init(void)
int error;
error = device_register(&platform_bus);
if (error) {
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment