xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Browse Source 
* 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (73 commits)
  arm: fix up some samsung merge sysdev conversion problems
  firmware: Fix an oops on reading fw_priv->fw in sysfs loading file
  Drivers:hv: Fix a bug in vmbus_driver_unregister()
  driver core: remove __must_check from device_create_file
  debugfs: add missing #ifdef HAS_IOMEM
  arm: time.h: remove device.h #include
  driver-core: remove sysdev.h usage.
  clockevents: remove sysdev.h
  arm: convert sysdev_class to a regular subsystem
  arm: leds: convert sysdev_class to a regular subsystem
  kobject: remove kset_find_obj_hinted()
  m86k: gpio - convert sysdev_class to a regular subsystem
  mips: txx9_sram - convert sysdev_class to a regular subsystem
  mips: 7segled - convert sysdev_class to a regular subsystem
  sh: dma - convert sysdev_class to a regular subsystem
  sh: intc - convert sysdev_class to a regular subsystem
  power: suspend - convert sysdev_class to a regular subsystem
  power: qe_ic - convert sysdev_class to a regular subsystem
  power: cmm - convert sysdev_class to a regular subsystem
  s390: time - convert sysdev_class to a regular subsystem
  ...

Fix up conflicts with 'struct sysdev' removal from various platform
drivers that got changed:
 - arch/arm/mach-exynos/cpu.c
 - arch/arm/mach-exynos/irq-eint.c
 - arch/arm/mach-s3c64xx/common.c
 - arch/arm/mach-s3c64xx/cpu.c
 - arch/arm/mach-s5p64x0/cpu.c
 - arch/arm/mach-s5pv210/common.c
 - arch/arm/plat-samsung/include/plat/cpu.h
 - arch/powerpc/kernel/sysfs.c
and fix up cpu_is_hotpluggable() as per Greg in include/linux/cpu.h
This commit is contained in:
Linus Torvalds
2012-01-07 12:03:30 -08:00
parent 356b95424c ff4b8a57f0
commit 7affca3537
517 changed files with 3168 additions and 6890 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/net/can/usb/ems_usb.c
View File

@@ -1115,28 +1115,4 @@ static struct usb_driver ems_usb_driver = {
.id_table = ems_usb_table,
};
static int __init ems_usb_init(void)
{
int err;
printk(KERN_INFO "CPC-USB kernel driver loaded\n");
/* register this driver with the USB subsystem */
err = usb_register(&ems_usb_driver);
if (err) {
err("usb_register failed. Error number %d\n", err);
return err;
}
return 0;
}
static void __exit ems_usb_exit(void)
{
/* deregister this driver with the USB subsystem */
usb_deregister(&ems_usb_driver);
}
module_init(ems_usb_init);
module_exit(ems_usb_exit);
module_usb_driver(ems_usb_driver);

23
drivers/net/can/usb/esd_usb2.c
View File

@@ -1108,25 +1108,4 @@ static struct usb_driver esd_usb2_driver = {
.id_table = esd_usb2_table,
};
static int __init esd_usb2_init(void)
{
int err;
/* register this driver with the USB subsystem */
err = usb_register(&esd_usb2_driver);
if (err) {
err("usb_register failed. Error number %d\n", err);
return err;
}
return 0;
}
module_init(esd_usb2_init);
static void __exit esd_usb2_exit(void)
{
/* deregister this driver with the USB subsystem */
usb_deregister(&esd_usb2_driver);
}
module_exit(esd_usb2_exit);
module_usb_driver(esd_usb2_driver);