From: 黄涛 <huangtao@rock-chips.com>
Date: Wed, 8 Sep 2010 06:21:03 +0000 (+0800)
Subject: board-*: 移除部分编译警告，其中names是指针的数组，不能直接赋为字符串，会引起内核oops
X-Git-Tag: firefly_0821_release~11175^2~3
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=18ea0d585cfb48432aad23fefb1198a08a263b1e;p=firefly-linux-kernel-4.4.55.git

board-*: 移除部分编译警告，其中names是指针的数组，不能直接赋为字符串，会引起内核oops
---

diff --git a/arch/arm/mach-rk2818/board-infosdk.c b/arch/arm/mach-rk2818/board-infosdk.c
index 609707151bfd..0d1fdc8ccd14 100755
--- a/arch/arm/mach-rk2818/board-infosdk.c
+++ b/arch/arm/mach-rk2818/board-infosdk.c
@@ -351,7 +351,6 @@ struct pca9554_platform_data rk2818_pca9554_data={
 	.pca9954_irq_pin=RK2818_PIN_PE2,
 	.settinginfo=extern_gpio_settinginfo,
 	.settinginfolen=ARRAY_SIZE(extern_gpio_settinginfo),
-	.names="pca9554",
 };
 #endif
 
@@ -458,7 +457,6 @@ struct tca6424_platform_data rk2818_tca6424_data={
 	.rk_irq_gpio_pull_up_down = GPIOPullUp,
 	.settinginfo=extgpio_tca6424_settinginfo,
 	.settinginfolen=ARRAY_SIZE(extgpio_tca6424_settinginfo),
-	.names="extend_gpio_tca6424",
 	.reseti2cpin = tca6424_reset_itr,
 };
 #endif
@@ -494,14 +492,16 @@ static struct wm8994_platform_data wm8994_data = {
  * i2c devices
  * author: kfx@rock-chips.com
 *****************************************************************************************/
-static void rk2818_i2c0_io_init(void)
+static int rk2818_i2c0_io_init(void)
 {
 	rk2818_mux_api_set(GPIOE_I2C0_SEL_NAME, IOMUXA_I2C0);
+	return 0;
 }
 
-static void rk2818_i2c1_io_init(void)
+static int rk2818_i2c1_io_init(void)
 {
 	rk2818_mux_api_set(GPIOE_U1IR_I2C1_NAME, IOMUXA_I2C1);
+	return 0;
 }
 struct rk2818_i2c_platform_data default_i2c0_data = { 
 	.bus_num    = 0,
diff --git a/arch/arm/mach-rk2818/board-midsdk.c b/arch/arm/mach-rk2818/board-midsdk.c
index c42f1c6b96fd..f18556ebbc55 100755
--- a/arch/arm/mach-rk2818/board-midsdk.c
+++ b/arch/arm/mach-rk2818/board-midsdk.c
@@ -250,7 +250,6 @@ struct pca9554_platform_data rk2818_pca9554_data={
 	.pca9954_irq_pin=RK2818_PIN_PE2,
 	.settinginfo=extern_gpio_settinginfo,
 	.settinginfolen=ARRAY_SIZE(extern_gpio_settinginfo),
-	.names="pca9554",
 };
 #endif
 
diff --git a/arch/arm/mach-rk2818/board-phonesdk.c b/arch/arm/mach-rk2818/board-phonesdk.c
index ec63df34107e..46da4192de9a 100755
--- a/arch/arm/mach-rk2818/board-phonesdk.c
+++ b/arch/arm/mach-rk2818/board-phonesdk.c
@@ -250,7 +250,6 @@ struct pca9554_platform_data rk2818_pca9554_data={
 	.pca9954_irq_pin=RK2818_PIN_PE2,
 	.settinginfo=extern_gpio_settinginfo,
 	.settinginfolen=ARRAY_SIZE(extern_gpio_settinginfo),
-	.names="pca9554",
 };
 #endif
 
diff --git a/arch/arm/mach-rk2818/board-raho.c b/arch/arm/mach-rk2818/board-raho.c
index b03a9a82a052..3c5eeb0128f5 100644
--- a/arch/arm/mach-rk2818/board-raho.c
+++ b/arch/arm/mach-rk2818/board-raho.c
@@ -358,7 +358,6 @@ struct pca9554_platform_data rk2818_pca9554_data={
 	.pca9954_irq_pin=RK2818_PIN_PE2,
 	.settinginfo=extern_gpio_settinginfo,
 	.settinginfolen=ARRAY_SIZE(extern_gpio_settinginfo),
-	.names="pca9554",
 };
 #endif
 
@@ -674,14 +673,16 @@ static struct wm8994_platform_data wm8994_data = {
  * i2c devices
  * author: kfx@rock-chips.com
 *****************************************************************************************/
-static void rk2818_i2c0_io_init(void)
+static int rk2818_i2c0_io_init(void)
 {
 	rk2818_mux_api_set(GPIOE_I2C0_SEL_NAME, IOMUXA_I2C0);
+	return 0;
 }
 
-static void rk2818_i2c1_io_init(void)
+static int rk2818_i2c1_io_init(void)
 {
 	rk2818_mux_api_set(GPIOE_U1IR_I2C1_NAME, IOMUXA_I2C1);
+	return 0;
 }
 
 struct rk2818_i2c_platform_data default_i2c0_data = {