apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues 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
drivers/net/irda/irda-usb.c
+1 -34
View File
@@ -1914,41 +1914,8 @@ static struct usb_driver irda_driver = {
#endif
};
/************************* MODULE CALLBACKS *************************/
/*
* Deal with module insertion/removal
* Mostly tell USB about our existence
*/
module_usb_driver(irda_driver);
/*------------------------------------------------------------------*/
/*
* Module insertion
*/
static int __init usb_irda_init(void)
{
int ret;
ret = usb_register(&irda_driver);
if (ret < 0)
return ret;
IRDA_MESSAGE("USB IrDA support registered\n");
return 0;
}
module_init(usb_irda_init);
/*------------------------------------------------------------------*/
/*
* Module removal
*/
static void __exit usb_irda_cleanup(void)
{
/* Deregister the driver and remove all pending instances */
usb_deregister(&irda_driver);
}
module_exit(usb_irda_cleanup);
/*------------------------------------------------------------------*/
/*
* Module parameters
*/
drivers/net/irda/kingsun-sir.c
+1 -18
View File
@@ -621,24 +621,7 @@ static struct usb_driver irda_driver = {
#endif
};
/*
* Module insertion
*/
static int __init kingsun_init(void)
{
return usb_register(&irda_driver);
}
module_init(kingsun_init);
/*
* Module removal
*/
static void __exit kingsun_cleanup(void)
{
/* Deregister the driver and remove all pending instances */
usb_deregister(&irda_driver);
}
module_exit(kingsun_cleanup);
module_usb_driver(irda_driver);
MODULE_AUTHOR("Alex Villacís Lasso <a_villacis@palosanto.com>");
MODULE_DESCRIPTION("IrDA-USB Dongle Driver for KingSun/DonShine");
drivers/net/irda/ks959-sir.c
+1 -20
View File
@@ -901,26 +901,7 @@ static struct usb_driver irda_driver = {
#endif
};
/*
* Module insertion
*/
static int __init ks959_init(void)
{
return usb_register(&irda_driver);
}
module_init(ks959_init);
/*
* Module removal
*/
static void __exit ks959_cleanup(void)
{
/* Deregister the driver and remove all pending instances */
usb_deregister(&irda_driver);
}
module_exit(ks959_cleanup);
module_usb_driver(irda_driver);
MODULE_AUTHOR("Alex Villacís Lasso <a_villacis@palosanto.com>");
MODULE_DESCRIPTION("IrDA-USB Dongle Driver for KingSun KS-959");
drivers/net/irda/ksdazzle-sir.c
+1 -20
View File
@@ -796,26 +796,7 @@ static struct usb_driver irda_driver = {
#endif
};
/*
* Module insertion
*/
static int __init ksdazzle_init(void)
{
return usb_register(&irda_driver);
}
module_init(ksdazzle_init);
/*
* Module removal
*/
static void __exit ksdazzle_cleanup(void)
{
/* Deregister the driver and remove all pending instances */
usb_deregister(&irda_driver);
}
module_exit(ksdazzle_cleanup);
module_usb_driver(irda_driver);
MODULE_AUTHOR("Alex Villacís Lasso <a_villacis@palosanto.com>");
MODULE_DESCRIPTION("IrDA-USB Dongle Driver for KingSun Dazzle");
drivers/net/irda/mcs7780.c
+1 -22
View File
@@ -968,25 +968,4 @@ static void mcs_disconnect(struct usb_interface *intf)
IRDA_DEBUG(0, "MCS7780 now disconnected.\n");
}
/* Module insertion */
static int __init mcs_init(void)
{
int result;
/* register this driver with the USB subsystem */
result = usb_register(&mcs_driver);
if (result)
IRDA_ERROR("usb_register failed. Error number %d\n", result);
return result;
}
module_init(mcs_init);
/* Module removal */
static void __exit mcs_exit(void)
{
/* deregister this driver with the USB subsystem */
usb_deregister(&mcs_driver);
}
module_exit(mcs_exit);
module_usb_driver(mcs_driver);
drivers/net/irda/stir4200.c
+1 -18
View File
@@ -1133,21 +1133,4 @@ static struct usb_driver irda_driver = {
#endif
};
/*
* Module insertion
*/
static int __init stir_init(void)
{
return usb_register(&irda_driver);
}
module_init(stir_init);
/*
* Module removal
*/
static void __exit stir_cleanup(void)
{
/* Deregister the driver and remove all pending instances */
usb_deregister(&irda_driver);
}
module_exit(stir_cleanup);
module_usb_driver(irda_driver);