Intel MID platform code cleanups
Subsystems (2)
v3 cover Intel MID platform code cleanups
Hi,
These patches are first cleanups on improving how Intel MID detects error in its platform code.
But due to current state of platform code is pretty bad, this first set does only cleanups (no functional changes). Functional fixes are coming in near future.
Change from v2 to v3:
- Since these patches are relevant for drivers being upstreamed (but not yet), I have no actual error to explain using only in-tree code. In order to address Ingo's comment about being more clear on changelogs, I stripped out functional changes from v2 and explicitly said I am sending cleanups for now.
Br, David Cohen
---
David Cohen (3):
x86: intel-mid: sfi_handle_*_dev() should check for pdata error code
x86: intel-mid: check get_gpio_by_name() error code on platform code
x86: intel-mid: return proper error code from get_gpio_by_name()
arch/x86/platform/intel-mid/device_libs/platform_emc1403.c | 4 +++- arch/x86/platform/intel-mid/device_libs/platform_gpio_keys.c | 2 +- arch/x86/platform/intel-mid/device_libs/platform_lis331.c | 4 +++- arch/x86/platform/intel-mid/device_libs/platform_max7315.c | 2 +- arch/x86/platform/intel-mid/device_libs/platform_mpu3050.c | 2 +- arch/x86/platform/intel-mid/device_libs/platform_pmic_gpio.c | 2 +- arch/x86/platform/intel-mid/device_libs/platform_tca6416.c | 4 ++-- arch/x86/platform/intel-mid/sfi.c | 8 +++++++- 8 files changed, 19 insertions(+), 9 deletions(-)
Signature · 1 line
1.8.4.2
PATCH v3 1/3 x86: intel-mid: sfi_handle_*_dev() should check for pdata error code
When Intel MID finds a match between SFI table from FW and registered SFI devices, it will always register a device regardless the platform code was successful or not.
This patch adds an extra option for platform code to return error code and abort device registration on SFI table parsing.
This patch does no functional change for current intel mid platform code.
--- arch/x86/platform/intel-mid/sfi.c | 6 ++++++ 1 file changed, 6 insertions(+)
arch/x86/platform/intel-mid/sfi.c +6 -0
@@ -337,6 +337,8 @@ static void __init sfi_handle_ipc_dev(struct sfi_device_table_entry *pentry,pr_debug ("IPC bus, name = %16.16s, irq = 0x%2x\n" , pentry->name, pentry->irq); pdata =intel_mid_sfi_get_pdata (dev, pentry); +if (IS_ERR (pdata)) +return ; pdev =platform_device_alloc (pentry->name,0 );if (pdev ==NULL ) {
@@ -370,6 +372,8 @@ static void __init sfi_handle_spi_dev(struct sfi_device_table_entry *pentry, spi_info.chip_select); pdata =intel_mid_sfi_get_pdata (dev, &spi_info); +if (IS_ERR (pdata)) +return ; spi_info.platform_data = pdata;if (dev->delay)
@@ -395,6 +399,8 @@ static void __init sfi_handle_i2c_dev(struct sfi_device_table_entry *pentry, i2c_info.addr); pdata =intel_mid_sfi_get_pdata (dev, &i2c_info); i2c_info.platform_data = pdata; +if (IS_ERR (pdata)) +return ;if (dev->delay)intel_scu_i2c_device_register (pentry->host_num, &i2c_info);
Signature · 1 line
1.8.4.2
tip-bot for David Cohen
merge bot[tip:x86/intel-mid] x86, intel-mid: sfi_handle_*_dev() should check for pdata error code
x86, intel-mid: sfi_handle_*_dev() should check for pdata error code
Commit-ID: acb20d7395f75b0fdb5b300f9fb3b9c6054fb04f Gitweb: http://git.kernel.org/tip/acb20d7395f75b0fdb5b300f9fb3b9c6054fb04f Author: David Cohen <[email protected]> AuthorDate: Thu, 16 Jan 2014 15:07:02 -0800 Committer: H. Peter Anvin <[email protected]> CommitDate: Thu, 16 Jan 2014 15:06:29 -0800
x86, intel-mid: sfi_handle_*_dev() should check for pdata error code
When Intel MID finds a match between SFI table from FW and registered SFI devices, it will always register a device regardless the platform code was successful or not.
This patch adds an extra option for platform code to return error code and abort device registration on SFI table parsing.
This patch does not contain any functional changes for current intel mid platform code.
--- arch/x86/platform/intel-mid/sfi.c | 6 ++++++ 1 file changed, 6 insertions(+)
arch/x86/platform/intel-mid/sfi.c +6 -0
@@ -337,6 +337,8 @@ static void __init sfi_handle_ipc_dev(struct sfi_device_table_entry *pentry,pr_debug ("IPC bus, name = %16.16s, irq = 0x%2x\n" , pentry->name, pentry->irq); pdata =intel_mid_sfi_get_pdata (dev, pentry); +if (IS_ERR (pdata)) +return ; pdev =platform_device_alloc (pentry->name,0 );if (pdev ==NULL ) {
@@ -370,6 +372,8 @@ static void __init sfi_handle_spi_dev(struct sfi_device_table_entry *pentry, spi_info.chip_select); pdata =intel_mid_sfi_get_pdata (dev, &spi_info); +if (IS_ERR (pdata)) +return ; spi_info.platform_data = pdata;if (dev->delay)
@@ -395,6 +399,8 @@ static void __init sfi_handle_i2c_dev(struct sfi_device_table_entry *pentry, i2c_info.addr); pdata =intel_mid_sfi_get_pdata (dev, &i2c_info); i2c_info.platform_data = pdata; +if (IS_ERR (pdata)) +return ;if (dev->delay)intel_scu_i2c_device_register (pentry->host_num, &i2c_info);
PATCH v3 2/3 x86: intel-mid: check get_gpio_by_name() error code on platform code
In reply to David CohenThis patch does cleanup on all intel mid platform code that uses gpio_get_by_name() function. From now on they should check for any error code instead of only hardcoded -1.
There is no functional change out of this change.
--- arch/x86/platform/intel-mid/device_libs/platform_emc1403.c | 4 +++- arch/x86/platform/intel-mid/device_libs/platform_gpio_keys.c | 2 +- arch/x86/platform/intel-mid/device_libs/platform_lis331.c | 4 +++- arch/x86/platform/intel-mid/device_libs/platform_max7315.c | 2 +- arch/x86/platform/intel-mid/device_libs/platform_mpu3050.c | 2 +- arch/x86/platform/intel-mid/device_libs/platform_pmic_gpio.c | 2 +- arch/x86/platform/intel-mid/device_libs/platform_tca6416.c | 4 ++-- 7 files changed, 12 insertions(+), 8 deletions(-)
arch/x86/platform/intel-mid/device_libs/platform_emc1403.c +3 -1
@@ -22,7 +22,9 @@ static void __init *emc1403_platform_data(void *info)int intr =get_gpio_by_name ("thermal_int" );int intr2nd =get_gpio_by_name ("thermal_alert" ); -if (intr ==-1 || intr2nd ==-1 ) +if (intr <0 ) +return NULL ; +if (intr2nd <0 )return NULL ; i2c_info->irq = intr +INTEL_MID_IRQ_OFFSET ;
arch/x86/platform/intel-mid/device_libs/platform_gpio_keys.c +1 -1
@@ -66,7 +66,7 @@ static int __init pb_keys_init(void) gb[i].gpio =get_gpio_by_name (gb[i].desc);pr_debug ("info[%2d]: name = %s, gpio = %d\n" , i, gb[i].desc, gb[i].gpio); -if (gb[i].gpio ==-1 ) +if (gb[i].gpio <0 )continue ;if (i != good)
arch/x86/platform/intel-mid/device_libs/platform_lis331.c +3 -1
@@ -21,7 +21,9 @@ static void __init *lis331dl_platform_data(void *info)int intr =get_gpio_by_name ("accel_int" );int intr2nd =get_gpio_by_name ("accel_2" ); -if (intr ==-1 || intr2nd ==-1 ) +if (intr <0 ) +return NULL ; +if (intr2nd <0 )return NULL ; i2c_info->irq = intr +INTEL_MID_IRQ_OFFSET ;
arch/x86/platform/intel-mid/device_libs/platform_max7315.c +1 -1
@@ -48,7 +48,7 @@ static void __init *max7315_platform_data(void *info) gpio_base =get_gpio_by_name (base_pin_name); intr =get_gpio_by_name (intr_pin_name); -if (gpio_base ==-1 ) +if (gpio_base <0 )return NULL ; max7315->gpio_base = gpio_base;if (intr !=-1 ) {
arch/x86/platform/intel-mid/device_libs/platform_mpu3050.c +1 -1
@@ -19,7 +19,7 @@ static void *mpu3050_platform_data(void *info)struct i2c_board_info *i2c_info = info;int intr =get_gpio_by_name ("mpu3050_int" ); -if (intr ==-1 ) +if (intr <0 )return NULL ; i2c_info->irq = intr +INTEL_MID_IRQ_OFFSET ;
arch/x86/platform/intel-mid/device_libs/platform_pmic_gpio.c +1 -1
@@ -26,7 +26,7 @@ static void __init *pmic_gpio_platform_data(void *info)static struct intel_pmic_gpio_platform_data pmic_gpio_pdata;int gpio_base =get_gpio_by_name ("pmic_gpio_base" ); -if (gpio_base ==-1 ) +if (gpio_base <0 ) gpio_base =64 ; pmic_gpio_pdata.gpio_base = gpio_base; pmic_gpio_pdata.irq_base = gpio_base +INTEL_MID_IRQ_OFFSET ;
arch/x86/platform/intel-mid/device_libs/platform_tca6416.c +2 -2
@@ -34,10 +34,10 @@ static void *tca6416_platform_data(void *info) gpio_base =get_gpio_by_name (base_pin_name); intr =get_gpio_by_name (intr_pin_name); -if (gpio_base ==-1 ) +if (gpio_base <0 )return NULL ; tca6416.gpio_base = gpio_base; -if (intr !=-1 ) { +if (intr >=0 ) { i2c_info->irq = intr +INTEL_MID_IRQ_OFFSET ; tca6416.irq_base = gpio_base +INTEL_MID_IRQ_OFFSET ; }else {
Signature · 1 line
1.8.4.2
tip-bot for David Cohen
merge bot[tip:x86/intel-mid] x86, intel-mid: Check get_gpio_by_name() error code on platform code
x86, intel-mid: Check get_gpio_by_name() error code on platform code
Commit-ID: a957a14bb4ca976cbaaff3594ef5b8f8f7f65804 Gitweb: http://git.kernel.org/tip/a957a14bb4ca976cbaaff3594ef5b8f8f7f65804 Author: David Cohen <[email protected]> AuthorDate: Thu, 16 Jan 2014 15:07:03 -0800 Committer: H. Peter Anvin <[email protected]> CommitDate: Thu, 16 Jan 2014 15:06:58 -0800
x86, intel-mid: Check get_gpio_by_name() error code on platform code
This patch does cleanup on all intel mid platform code that uses gpio_get_by_name() function. From now on they should check for any error code instead of only hardcoded -1.
There are no functional changes from this change.
--- arch/x86/platform/intel-mid/device_libs/platform_emc1403.c | 4 +++- arch/x86/platform/intel-mid/device_libs/platform_gpio_keys.c | 2 +- arch/x86/platform/intel-mid/device_libs/platform_lis331.c | 4 +++- arch/x86/platform/intel-mid/device_libs/platform_max7315.c | 2 +- arch/x86/platform/intel-mid/device_libs/platform_mpu3050.c | 2 +- arch/x86/platform/intel-mid/device_libs/platform_pmic_gpio.c | 2 +- arch/x86/platform/intel-mid/device_libs/platform_tca6416.c | 4 ++-- 7 files changed, 12 insertions(+), 8 deletions(-)
arch/x86/platform/intel-mid/device_libs/platform_emc1403.c +3 -1
@@ -22,7 +22,9 @@ static void __init *emc1403_platform_data(void *info)int intr =get_gpio_by_name ("thermal_int" );int intr2nd =get_gpio_by_name ("thermal_alert" ); -if (intr ==-1 || intr2nd ==-1 ) +if (intr <0 ) +return NULL ; +if (intr2nd <0 )return NULL ; i2c_info->irq = intr +INTEL_MID_IRQ_OFFSET ;
arch/x86/platform/intel-mid/device_libs/platform_gpio_keys.c +1 -1
@@ -66,7 +66,7 @@ static int __init pb_keys_init(void) gb[i].gpio =get_gpio_by_name (gb[i].desc);pr_debug ("info[%2d]: name = %s, gpio = %d\n" , i, gb[i].desc, gb[i].gpio); -if (gb[i].gpio ==-1 ) +if (gb[i].gpio <0 )continue ;if (i != good)
arch/x86/platform/intel-mid/device_libs/platform_lis331.c +3 -1
@@ -21,7 +21,9 @@ static void __init *lis331dl_platform_data(void *info)int intr =get_gpio_by_name ("accel_int" );int intr2nd =get_gpio_by_name ("accel_2" ); -if (intr ==-1 || intr2nd ==-1 ) +if (intr <0 ) +return NULL ; +if (intr2nd <0 )return NULL ; i2c_info->irq = intr +INTEL_MID_IRQ_OFFSET ;
arch/x86/platform/intel-mid/device_libs/platform_max7315.c +1 -1
@@ -48,7 +48,7 @@ static void __init *max7315_platform_data(void *info) gpio_base =get_gpio_by_name (base_pin_name); intr =get_gpio_by_name (intr_pin_name); -if (gpio_base ==-1 ) +if (gpio_base <0 )return NULL ; max7315->gpio_base = gpio_base;if (intr !=-1 ) {
arch/x86/platform/intel-mid/device_libs/platform_mpu3050.c +1 -1
@@ -19,7 +19,7 @@ static void *mpu3050_platform_data(void *info)struct i2c_board_info *i2c_info = info;int intr =get_gpio_by_name ("mpu3050_int" ); -if (intr ==-1 ) +if (intr <0 )return NULL ; i2c_info->irq = intr +INTEL_MID_IRQ_OFFSET ;
arch/x86/platform/intel-mid/device_libs/platform_pmic_gpio.c +1 -1
@@ -26,7 +26,7 @@ static void __init *pmic_gpio_platform_data(void *info)static struct intel_pmic_gpio_platform_data pmic_gpio_pdata;int gpio_base =get_gpio_by_name ("pmic_gpio_base" ); -if (gpio_base ==-1 ) +if (gpio_base <0 ) gpio_base =64 ; pmic_gpio_pdata.gpio_base = gpio_base; pmic_gpio_pdata.irq_base = gpio_base +INTEL_MID_IRQ_OFFSET ;
arch/x86/platform/intel-mid/device_libs/platform_tca6416.c +2 -2
@@ -34,10 +34,10 @@ static void *tca6416_platform_data(void *info) gpio_base =get_gpio_by_name (base_pin_name); intr =get_gpio_by_name (intr_pin_name); -if (gpio_base ==-1 ) +if (gpio_base <0 )return NULL ; tca6416.gpio_base = gpio_base; -if (intr !=-1 ) { +if (intr >=0 ) { i2c_info->irq = intr +INTEL_MID_IRQ_OFFSET ; tca6416.irq_base = gpio_base +INTEL_MID_IRQ_OFFSET ; }else {
PATCH v3 3/3 x86: intel-mid: return proper error code from get_gpio_by_name()
In reply to David CohenThis patch does a cleanup on get_gpio_by_name(). It should return an error code instead of hardcoded -1.
--- arch/x86/platform/intel-mid/sfi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/platform/intel-mid/sfi.c +1 -1
@@ -224,7 +224,7 @@ int get_gpio_by_name(const char *name)if (!strncmp (name, pentry->pin_name,SFI_NAME_LEN ))return pentry->pin_no; } -return -1 ; +return -EINVAL ; }void __init intel_scu_device_register (struct platform_device *pdev)
Signature · 1 line
1.8.4.2
tip-bot for David Cohen
merge bot[tip:x86/intel-mid] x86, intel-mid: Return proper error code from get_gpio_by_name()
x86, intel-mid: Return proper error code from get_gpio_by_name()
Commit-ID: 28c6a39b3367f29462cd586785dc445cd6b5ac23 Gitweb: http://git.kernel.org/tip/28c6a39b3367f29462cd586785dc445cd6b5ac23 Author: David Cohen <[email protected]> AuthorDate: Thu, 16 Jan 2014 15:07:04 -0800 Committer: H. Peter Anvin <[email protected]> CommitDate: Thu, 16 Jan 2014 15:07:36 -0800
x86, intel-mid: Return proper error code from get_gpio_by_name()
This patch cleans up get_gpio_by_name() to return an error code instead of hardcoded -1.
--- arch/x86/platform/intel-mid/sfi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/platform/intel-mid/sfi.c +1 -1
@@ -224,7 +224,7 @@ int get_gpio_by_name(const char *name)if (!strncmp (name, pentry->pin_name,SFI_NAME_LEN ))return pentry->pin_no; } -return -1 ; +return -EINVAL ; }void __init intel_scu_device_register (struct platform_device *pdev)