mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
Char / Misc driver update for 3.10-rc1
Here's the big char / misc driver update for 3.10-rc1 A number of various driver updates, the majority being new functionality in the MEI driver subsystem (it's now a subsystem, it started out just a single driver), extcon updates, memory updates, hyper-v updates, and a bunch of other small stuff that doesn't fit in any other tree. All of these have been in linux-next for a while Signed-off-by: Greg Kroah-Hartman <[email protected]> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iEYEABECAAYFAlF+mtYACgkQMUfUDdst+ymFXQCfdLsD4Cxz+jkgW+tljh9i70XD OFkAnRPMMhLS8/kddf02lLMYzYUFdy1U =zaFJ -----END PGP SIGNATURE----- Merge tag 'char-misc-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc Pull char/misc driver update from Greg Kroah-Hartman: "Here's the big char / misc driver update for 3.10-rc1 A number of various driver updates, the majority being new functionality in the MEI driver subsystem (it's now a subsystem, it started out just a single driver), extcon updates, memory updates, hyper-v updates, and a bunch of other small stuff that doesn't fit in any other tree. All of these have been in linux-next for a while" * tag 'char-misc-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (148 commits) Tools: hv: Fix a checkpatch warning tools: hv: skip iso9660 mounts in hv_vss_daemon tools: hv: use FIFREEZE/FITHAW in hv_vss_daemon tools: hv: use getmntent in hv_vss_daemon Tools: hv: Fix a checkpatch warning tools: hv: fix checks for origin of netlink message in hv_vss_daemon Tools: hv: fix warnings in hv_vss_daemon misc: mark spear13xx-pcie-gadget as broken mei: fix krealloc() misuse in in mei_cl_irq_read_msg() mei: reduce flow control only for completed messages mei: reseting -> resetting mei: fix reading large reposnes mei: revamp mei_irq_read_client_message function mei: revamp mei_amthif_irq_read_message mei: revamp hbm state machine Revert "drivers/scsi: use module_pcmcia_driver() in pcmcia drivers" Revert "scsi: pcmcia: nsp_cs: remove module init/exit function prototypes" scsi: pcmcia: nsp_cs: remove module init/exit function prototypes mei: wd: fix line over 80 characters misc: tsl2550: Use dev_pm_ops ...
This commit is contained in:
commit
4f567cbc95
131 changed files with 4596 additions and 1331 deletions
|
|
@ -804,8 +804,8 @@ static long ac_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
|
|||
|
||||
printk(KERN_INFO "Prom version board %d ....... V%d.%d %s",
|
||||
i+1,
|
||||
(int)(readb(apbs[IndexCard].RamIO + VERS) >> 4),
|
||||
(int)(readb(apbs[IndexCard].RamIO + VERS) & 0xF),
|
||||
(int)(readb(apbs[i].RamIO + VERS) >> 4),
|
||||
(int)(readb(apbs[i].RamIO + VERS) & 0xF),
|
||||
boardname);
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -228,18 +228,7 @@ static struct platform_driver mxc_rnga_driver = {
|
|||
.remove = __exit_p(mxc_rnga_remove),
|
||||
};
|
||||
|
||||
static int __init mod_init(void)
|
||||
{
|
||||
return platform_driver_probe(&mxc_rnga_driver, mxc_rnga_probe);
|
||||
}
|
||||
|
||||
static void __exit mod_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&mxc_rnga_driver);
|
||||
}
|
||||
|
||||
module_init(mod_init);
|
||||
module_exit(mod_exit);
|
||||
module_platform_driver_probe(mxc_rnga_driver, mxc_rnga_probe);
|
||||
|
||||
MODULE_AUTHOR("Freescale Semiconductor, Inc.");
|
||||
MODULE_DESCRIPTION("H/W RNGA driver for i.MX");
|
||||
|
|
|
|||
|
|
@ -166,18 +166,7 @@ static struct platform_driver tx4939_rng_driver = {
|
|||
.remove = tx4939_rng_remove,
|
||||
};
|
||||
|
||||
static int __init tx4939rng_init(void)
|
||||
{
|
||||
return platform_driver_probe(&tx4939_rng_driver, tx4939_rng_probe);
|
||||
}
|
||||
|
||||
static void __exit tx4939rng_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&tx4939_rng_driver);
|
||||
}
|
||||
|
||||
module_init(tx4939rng_init);
|
||||
module_exit(tx4939rng_exit);
|
||||
module_platform_driver_probe(tx4939_rng_driver, tx4939_rng_probe);
|
||||
|
||||
MODULE_DESCRIPTION("H/W Random Number Generator (RNG) driver for TX4939");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
|
|
|||
|
|
@ -371,7 +371,7 @@ static int srom_setup_minor(struct srom_dev *srom, int index)
|
|||
|
||||
dev = device_create(srom_class, &platform_bus,
|
||||
MKDEV(srom_major, index), srom, "%d", index);
|
||||
return IS_ERR(dev) ? PTR_ERR(dev) : 0;
|
||||
return PTR_RET(dev);
|
||||
}
|
||||
|
||||
/** srom_init() - Initialize the driver's module. */
|
||||
|
|
|
|||
Loading…
Reference in a new issue