bybrooklyn/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-04-18 06:44:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'char-misc-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Browse Source 
Pull char/misc driver updates from Greg KH:
 "Here is the "big" char and misc driver patches for 4.18-rc1.

  It's not a lot of stuff here, but there are some highlights:

   - coreboot driver updates

   - soundwire driver updates

   - android binder updates

   - fpga big sync, mostly documentation

   - lots of minor driver updates

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'char-misc-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (81 commits)
  vmw_balloon: fixing double free when batching mode is off
  MAINTAINERS: Add driver-api/fpga path
  fpga: clarify that unregister functions also free
  documentation: fpga: move fpga-region.txt to driver-api
  documentation: fpga: add bridge document to driver-api
  documentation: fpga: move fpga-mgr.txt to driver-api
  Documentation: fpga: move fpga overview to driver-api
  fpga: region: kernel-doc fixes
  fpga: bridge: kernel-doc fixes
  fpga: mgr: kernel-doc fixes
  fpga: use SPDX
  fpga: region: change api, add fpga_region_create/free
  fpga: bridge: change api, don't use drvdata
  fpga: manager: change api, don't use drvdata
  fpga: region: don't use drvdata in common fpga code
  Drivers: hv: vmbus: Removed an unnecessary cast from void *
  ver_linux: Drop redundant calls to system() to test if file is readable
  ver_linux: Move stderr redirection from function parameter to function body
  misc: IBM Virtual Management Channel Driver (VMC)
  rpmsg: Correct support for MODULE_DEVICE_TABLE()
  ...
This commit is contained in:
Linus Torvalds
2018-06-05 16:20:22 -07:00
parent 07c4dd3435 b23220fe05
commit abf7dba7c4
132 changed files with 8983 additions and 1236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/nubus/bus.c
View File

@@ -63,20 +63,15 @@ static struct device nubus_parent = {
.init_name = "nubus",
};
int __init nubus_bus_register(void)
static int __init nubus_bus_register(void)
{
int err;
return bus_register(&nubus_bus_type);
}
postcore_initcall(nubus_bus_register);
err = device_register(&nubus_parent);
if (err)
return err;
err = bus_register(&nubus_bus_type);
if (!err)
return 0;
device_unregister(&nubus_parent);
return err;
int __init nubus_parent_device_register(void)
{
return device_register(&nubus_parent);
}
static void nubus_device_release(struct device *dev)

2
drivers/nubus/nubus.c
View File

@@ -875,7 +875,7 @@ static int __init nubus_init(void)
return 0;
nubus_proc_init();
err = nubus_bus_register();
err = nubus_parent_device_register();
if (err)
return err;
nubus_scan_bus();