Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f9d2760 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull char and misc patches for 3.4-rc1 from Greg KH:
 "Not much here, just a few minor fixes and some conversions to the
  module_*_driver() functions, making the codebase smaller."

* tag 'char-misc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  misc: bmp085: Use unsigned long to store jiffies
  char/ramoops: included linux/err.h twice
  misc: bmp085: Handle jiffies overflow correctly
  misc: fsa9480: Remove obsolete cleanup for clientdata
  char: Fix typo in tlclk.c
  char: Fix typo in viotape.c
  cs5535-mfgpt: don't call __init function from __devinit
  MISC: convert drivers/misc/* to use module_spi_driver()
  MISC: convert drivers/misc/* to use module_i2c_driver()
  MISC: convert drivers/misc/* to use module_platform_driver()
parents ad2a8e60 b222258a

drivers/char/ramoops.c

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <linux/module.h>

#include <linux/kmsg_dump.h>

#include <linux/time.h>

#include <linux/err.h>

#include <linux/io.h>

#include <linux/ioport.h>

#include <linux/platform_device.h>

drivers/char/tlclk.c

+1 −1
Original line number Diff line number Diff line
@@ -797,7 +797,7 @@ static int __init tlclk_init(void) 
	telclk_interrupt = (inb(TLCLK_REG7) & 0x0f);



	if (0x0F == telclk_interrupt ) { /* not MCPBL0010 ? */

		printk(KERN_ERR "telclk_interrup = 0x%x non-mcpbl0010 hw.\n",

		printk(KERN_ERR "telclk_interrupt = 0x%x non-mcpbl0010 hw.\n",

			telclk_interrupt);

		ret = -ENXIO;

		goto out3;

drivers/char/viotape.c

+1 −1
Original line number Diff line number Diff line
@@ -976,7 +976,7 @@ int __init viotap_init(void) 


	tape_class = class_create(THIS_MODULE, "tape");

	if (IS_ERR(tape_class)) {

		printk(VIOTAPE_KERN_WARN "Unable to allocat class\n");

		printk(VIOTAPE_KERN_WARN "Unable to allocate class\n");

		ret = PTR_ERR(tape_class);

		goto unreg_chrdev;

	}

drivers/misc/ad525x_dpot-i2c.c

+1 −11
Original line number Diff line number Diff line
@@ -113,17 +113,7 @@ static struct i2c_driver ad_dpot_i2c_driver = { 
	.id_table	= ad_dpot_id,

};



static int __init ad_dpot_i2c_init(void)

{

	return i2c_add_driver(&ad_dpot_i2c_driver);

}

module_init(ad_dpot_i2c_init);



static void __exit ad_dpot_i2c_exit(void)

{

	i2c_del_driver(&ad_dpot_i2c_driver);

}

module_exit(ad_dpot_i2c_exit);

module_i2c_driver(ad_dpot_i2c_driver);



MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");

MODULE_DESCRIPTION("digital potentiometer I2C bus driver");

drivers/misc/ad525x_dpot-spi.c

+1 −11
Original line number Diff line number Diff line
@@ -135,17 +135,7 @@ static struct spi_driver ad_dpot_spi_driver = { 
	.id_table	= ad_dpot_spi_id,

};



static int __init ad_dpot_spi_init(void)

{

	return spi_register_driver(&ad_dpot_spi_driver);

}

module_init(ad_dpot_spi_init);



static void __exit ad_dpot_spi_exit(void)

{

	spi_unregister_driver(&ad_dpot_spi_driver);

}

module_exit(ad_dpot_spi_exit);

module_spi_driver(ad_dpot_spi_driver);



MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");

MODULE_DESCRIPTION("digital potentiometer SPI bus driver");