1 From 2c83888b2170d3883c9316c4d94dddc4b7f9ec68 Mon Sep 17 00:00:00 2001
2 From: Alison Wang <b18965@freescale.com>
3 Date: Thu, 4 Aug 2011 09:59:55 +0800
4 Subject: [PATCH 48/52] Fix i2c driver bug when reinserting as module
6 Signed-off-by: Alison Wang <b18965@freescale.com>
8 drivers/i2c/busses/i2c-mcf-slave.c | 14 ++++++++++++++
9 drivers/i2c/busses/i2c-mcf.c | 14 ++++++++++++++
10 2 files changed, 28 insertions(+), 0 deletions(-)
12 --- a/drivers/i2c/busses/i2c-mcf-slave.c
13 +++ b/drivers/i2c/busses/i2c-mcf-slave.c
14 @@ -273,8 +273,15 @@ static int __init gen_i2c_proc_init(void
19 +static int gen_i2c_proc_deinit(void)
21 + remove_proc_entry("driver/i2c-adaptor-register", NULL);
25 static inline int gen_i2c_proc_init(void) { return 0; }
26 +static inline int gen_i2c_proc_deinit(void) { return 0; }
27 #endif /* CONFIG_PROC_FS */
30 @@ -345,6 +352,13 @@ static int __init i2c_coldfire_init(void
32 static void __exit i2c_coldfire_exit(void)
36 + retval = gen_i2c_proc_deinit();
38 + printk(KERN_INFO "remove /proc/i2c-adaptor-register "
39 + "for i2c slave mode failed!\n");
41 /* disable I2C and Interrupt */
42 MCF_I2CR &= ~(MCF_I2CR_IEN | MCF_I2CR_IIEN);
44 --- a/drivers/i2c/busses/i2c-mcf.c
45 +++ b/drivers/i2c/busses/i2c-mcf.c
46 @@ -669,8 +669,15 @@ static int __init gen_i2c_proc_init(void
51 +static int gen_i2c_proc_deinit(void)
53 + remove_proc_entry("driver/i2c-adaptor-register", NULL);
57 static inline int gen_i2c_proc_init(void) { return 0; }
58 +static inline int gen_i2c_proc_deinit(void) { return 0; }
59 #endif /* CONFIG_PROC_FS */
61 static int __init coldfire_i2c_init(void)
62 @@ -687,6 +694,13 @@ static int __init coldfire_i2c_init(void
64 static void __exit coldfire_i2c_exit(void)
68 + retval = gen_i2c_proc_deinit();
70 + printk(KERN_INFO "remove /proc/i2c-adaptor-register "
71 + "for i2c master mode failed!\n");
73 platform_driver_unregister(&mcf_i2c_driver);