sfi: fix compiler warnings
PATCH RESEND 1/3 sfi: fix compiler warnings
This fixes the following compiler warnings when build is done by make W=1.
drivers/sfi/sfi_acpi.c:154:5: warning: no previous prototype for ‘sfi_acpi_table_parse’ [-Wmissing-prototypes]
drivers/sfi/sfi_core.c:164:26: warning: no previous prototype for ‘sfi_map_table’ [-Wmissing-prototypes] drivers/sfi/sfi_core.c:192:6: warning: no previous prototype for ‘sfi_unmap_table’ [-Wmissing-prototypes]
Indentation fixes are also included.
--- drivers/sfi/sfi_acpi.c | 8 ++++---- drivers/sfi/sfi_core.c | 4 ++-- include/linux/sfi_acpi.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-)
drivers/sfi/sfi_acpi.c +4 -4
@@ -63,6 +63,7 @@#include <acpi/acpi.h> #include <linux/sfi.h> +#include <linux/sfi_acpi.h> #include "sfi_core.h" /*
@@ -152,7 +153,7 @@ static void sfi_acpi_put_table(struct acpi_table_header *table)* Find specified table in XSDT, run handler on it and return its return value */ int sfi_acpi_table_parse (char *signature,char *oem_id,char *oem_table_id, -int (*handler)(struct acpi_table_header *)) +int (*handler)(struct acpi_table_header *)) {struct acpi_table_header *table =NULL ;struct sfi_table_key key;
@@ -175,8 +176,8 @@ int sfi_acpi_table_parse(char *signature, char *oem_id, char *oem_table_id, }static ssize_t sfi_acpi_table_show (struct file *filp,struct kobject *kobj, -struct bin_attribute *bin_attr,char *buf, -loff_t offset,size_t count) +struct bin_attribute *bin_attr,char *buf, +loff_t offset,size_t count) {struct sfi_table_attr *tbl_attr = container_of(bin_attr, struct sfi_table_attr, attr);
@@ -199,7 +200,6 @@ static ssize_t sfi_acpi_table_show(struct file *filp, struct kobject *kobj,return cnt; } -void __init sfi_acpi_sysfs_init (void ) {u32 tbl_cnt, i;
drivers/sfi/sfi_core.c +2 -2
@@ -161,7 +161,7 @@ static int sfi_verify_table(struct sfi_table_header *table)* Check for common case that we can re-use mapping to SYST, * which requires syst_pa, syst_va to be initialized. */ -struct sfi_table_header *sfi_map_table (u64 pa) +static struct sfi_table_header *sfi_map_table (u64 pa) {struct sfi_table_header *th;u32 length;
@@ -189,7 +189,7 @@ struct sfi_table_header *sfi_map_table(u64 pa)* Undoes effect of sfi_map_table() by unmapping table * if it did not completely fit on same page as SYST. */ -void sfi_unmap_table (struct sfi_table_header *th) +static void sfi_unmap_table (struct sfi_table_header *th) {if (!TABLE_ON_PAGE (syst_va, th, th->len)) sfi_unmap_memory(th, TABLE_ON_PAGE(th, th, th->len) ?
include/linux/sfi_acpi.h +1 -1
@@ -60,7 +60,7 @@#define _LINUX_SFI_ACPI_H#ifdef CONFIG_SFI -#include <acpi/acpi.h> /* struct acpi_table_header */ +#include <linux/acpi.h> /* struct acpi_table_header */ extern int sfi_acpi_table_parse(char *signature, char *oem_id, char *oem_table_id,
Signature · 1 line
1.8.2.rc0.22.gb3600c3
PATCH RESEND 2/3 gpiolib: append SFI helpers for GPIO API
To support some (legacy) firmwares and platforms let's make life easier for their customers.
This patch extracts SFI GPIO API from arch/x86/platform/mrst/mrst.c.
--- drivers/gpio/Kconfig | 4 +++ drivers/gpio/Makefile | 1 + drivers/gpio/gpiolib-sfi.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++ drivers/sfi/sfi_core.c | 7 +++++ include/linux/sfi_gpio.h | 27 ++++++++++++++++ 5 files changed, 115 insertions(+) create mode 100644 drivers/gpio/gpiolib-sfi.c create mode 100644 include/linux/sfi_gpio.h
drivers/gpio/Kconfig +4 -0
@@ -51,6 +51,10 @@ config OF_GPIO def_bool y depends on OF +config GPIO_SFI + def_bool y + depends on SFI + config GPIO_ACPI def_bool y depends on ACPI
drivers/gpio/Makefile +1 -0
@@ -5,6 +5,7 @@ ccflags-$(CONFIG_DEBUG_GPIO) += -DDEBUG obj-$(CONFIG_GPIO_DEVRES) += devres.o obj-$(CONFIG_GPIOLIB) += gpiolib.o obj-$(CONFIG_OF_GPIO) += gpiolib-of.o +obj-$(CONFIG_GPIO_SFI) += gpiolib-sfi.o obj-$(CONFIG_GPIO_ACPI) += gpiolib-acpi.o # Device drivers. Generally keep list sorted alphabetically
drivers/gpio/gpiolib-sfi.c new file +76 -0
76 lines not on this page · raw message
drivers/sfi/sfi_core.c +7 -0
@@ -67,6 +67,7 @@#include <linux/acpi.h> #include <linux/init.h> #include <linux/sfi.h> +#include <linux/sfi_gpio.h> #include <linux/slab.h> #include "sfi_core.h"
@@ -512,6 +513,12 @@ void __init sfi_init_late(void) syst_va =sfi_map_memory (syst_pa, length);sfi_acpi_init (); + +/* +* Parsing GPIO table first, since the DEVS table will need this table +* to map the pin name to the actual pin. +*/ +sfi_gpio_init (); }/*
include/linux/sfi_gpio.h new file +27 -0
@@ -0,0 +1,27 @@ +#ifndef _LINUX_SFI_GPIO_H_ +#define _LINUX_SFI_GPIO_H_ + +#include <linux/errno.h> +#include <linux/gpio.h> +#include <linux/sfi.h> + +#ifdef CONFIG_GPIO_SFI + +int sfi_get_gpio_by_name (const char *name); +int __init sfi_gpio_init (void ); + +#else /* CONFIG_GPIO_SFI */ + +static inline int sfi_get_gpio_by_name (const char *name); +{ +return -1 ; +} + +static inline int __init sfi_gpio_init (void ) +{ +return -ENODEV ; +} + +#endif /* CONFIG_GPIO_SFI */ + +#endif /* _LINUX_SFI_GPIO_H_ */
Signature · 1 line
1.8.2.rc0.22.gb3600c3
Re: [PATCH, resend 2/3] gpiolib: append SFI helpers for GPIO API
Drop this one away, Sathyanarayanan Kuppuswamy takes care about it in his patchset.
Signature · 2 lines
With Best Regards, Andy Shevchenko
PATCH RESEND 3/3 x86: mrst: move to generic SFI GPIO API
In reply to Andy ShevchenkoLet's use the common SFI helpers for GPIO API.
--- arch/x86/platform/mrst/mrst.c | 94 ++++++++++--------------------------------- 1 file changed, 22 insertions(+), 72 deletions(-)
arch/x86/platform/mrst/mrst.c +22 -72
@@ -17,6 +17,7 @@#include <linux/interrupt.h> #include <linux/scatterlist.h> #include <linux/sfi.h> +#include <linux/sfi_gpio.h> #include <linux/intel_pmic_gpio.h> #include <linux/spi/spi.h> #include <linux/i2c.h>
@@ -28,7 +29,6 @@#include <linux/module.h> #include <linux/notifier.h> #include <linux/mfd/intel_msic.h> -#include <linux/gpio.h> #include <linux/i2c/tc35876x.h> #include <asm/setup.h>
@@ -219,7 +219,7 @@ static unsigned long __init mrst_calibrate_tsc(void) lapic_timer_frequency = fsb *1000 /HZ ;/* mark tsc clocksource as reliable */ set_cpu_cap (&boot_cpu_data,X86_FEATURE_TSC_RELIABLE ); - +if (fast_calibrate)return fast_calibrate;
@@ -338,55 +338,6 @@ static inline int __init setup_x86_mrst_timer(char *arg)__setup ("x86_mrst_timer=" , setup_x86_mrst_timer);/* -* Parsing GPIO table first, since the DEVS table will need this table -* to map the pin name to the actual pin. -*/ -static struct sfi_gpio_table_entry *gpio_table; -static int gpio_num_entry; - -static int __init sfi_parse_gpio (struct sfi_table_header *table) -{ -struct sfi_table_simple *sb; -struct sfi_gpio_table_entry *pentry; -int num, i; - -if (gpio_table) -return 0 ; - sb = (struct sfi_table_simple *)table; - num = SFI_GET_NUM_ENTRIES(sb, struct sfi_gpio_table_entry); - pentry = (struct sfi_gpio_table_entry *)sb->pentry; - - gpio_table =kmalloc (num *sizeof (*pentry),GFP_KERNEL ); -if (!gpio_table) -return -1 ; -memcpy (gpio_table, pentry, num *sizeof (*pentry)); - gpio_num_entry = num; - -pr_debug ("GPIO pin info:\n" ); -for (i =0 ; i < num; i++, pentry++) -pr_debug ("info[%2d]: controller = %16.16s, pin_name = %16.16s," -" pin = %d\n" , i, - pentry->controller_name, - pentry->pin_name, - pentry->pin_no); -return 0 ; -} - -static int get_gpio_by_name (const char *name) -{ -struct sfi_gpio_table_entry *pentry = gpio_table; -int i; - -if (!pentry) -return -1 ; -for (i =0 ; i < gpio_num_entry; i++, pentry++) { -if (!strncmp (name, pentry->pin_name,SFI_NAME_LEN )) -return pentry->pin_no; - } -return -1 ; -} - -/* * Here defines the array of devices platform data that IAFW would export * through SFI "DEVS" table, we use name and type to match the device and * its platform data.
@@ -404,7 +355,7 @@ struct devs_id {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" ); +int gpio_base =sfi_get_gpio_by_name ("pmic_gpio_base" );if (gpio_base ==-1 ) gpio_base =64 ;
@@ -418,7 +369,7 @@ static void __init *pmic_gpio_platform_data(void *info)static void __init *max3111_platform_data (void *info) {struct spi_board_info *spi_info = info; -int intr =get_gpio_by_name ("max3111_int" ); +int intr =sfi_get_gpio_by_name ("max3111_int" ); spi_info->mode =SPI_MODE_0 ;if (intr ==-1 )
@@ -456,8 +407,8 @@ static void __init *max7315_platform_data(void *info)strcpy (intr_pin_name,"max7315_int" ); } - gpio_base =get_gpio_by_name (base_pin_name); - intr =get_gpio_by_name (intr_pin_name); + gpio_base =sfi_get_gpio_by_name (base_pin_name); + intr =sfi_get_gpio_by_name (intr_pin_name);if (gpio_base ==-1 )return NULL ;
@@ -484,8 +435,8 @@ static void *tca6416_platform_data(void *info)strcpy (base_pin_name,"tca6416_base" );strcpy (intr_pin_name,"tca6416_int" ); - gpio_base =get_gpio_by_name (base_pin_name); - intr =get_gpio_by_name (intr_pin_name); + gpio_base =sfi_get_gpio_by_name (base_pin_name); + intr =sfi_get_gpio_by_name (intr_pin_name);if (gpio_base ==-1 )return NULL ;
@@ -503,7 +454,7 @@ static void *tca6416_platform_data(void *info)static void *mpu3050_platform_data (void *info) {struct i2c_board_info *i2c_info = info; -int intr =get_gpio_by_name ("mpu3050_int" ); +int intr =sfi_get_gpio_by_name ("mpu3050_int" );if (intr ==-1 )return NULL ;
@@ -516,8 +467,8 @@ static void __init *emc1403_platform_data(void *info) {static short intr2nd_pdata;struct i2c_board_info *i2c_info = info; -int intr =get_gpio_by_name ("thermal_int" ); -int intr2nd =get_gpio_by_name ("thermal_alert" ); +int intr =sfi_get_gpio_by_name ("thermal_int" ); +int intr2nd =sfi_get_gpio_by_name ("thermal_alert" );if (intr ==-1 || intr2nd ==-1 )return NULL ;
@@ -532,8 +483,8 @@ static void __init *lis331dl_platform_data(void *info) {static short intr2nd_pdata;struct i2c_board_info *i2c_info = info; -int intr =get_gpio_by_name ("accel_int" ); -int intr2nd =get_gpio_by_name ("accel_2" ); +int intr =sfi_get_gpio_by_name ("accel_int" ); +int intr2nd =sfi_get_gpio_by_name ("accel_2" );if (intr ==-1 || intr2nd ==-1 )return NULL ;
@@ -628,7 +579,7 @@ static void *msic_battery_platform_data(void *info)static void *msic_gpio_platform_data (void *info) {static struct intel_msic_gpio_pdata pdata; -int gpio =get_gpio_by_name ("msic_gpio_base" ); +int gpio =sfi_get_gpio_by_name ("msic_gpio_base" );if (gpio <0 )return NULL ;
@@ -660,7 +611,7 @@ static void *msic_power_btn_platform_data(void *info)static void *msic_ocd_platform_data (void *info) {static struct intel_msic_ocd_pdata pdata; -int gpio =get_gpio_by_name ("ocd_gpio" ); +int gpio =sfi_get_gpio_by_name ("ocd_gpio" );if (gpio <0 )return NULL ;
@@ -679,14 +630,14 @@ static void *msic_thermal_platform_data(void *info)/* tc35876x DSI-LVDS bridge chip and panel platform data */ static void *tc35876x_platform_data (void *data) { -static struct tc35876x_platform_data pdata; +static struct tc35876x_platform_data pdata; -/* gpio pins set to -1 will not be used by the driver */ - pdata.gpio_bridge_reset =get_gpio_by_name ("LCMB_RXEN" ); - pdata.gpio_panel_bl_en =get_gpio_by_name ("6S6P_BL_EN" ); - pdata.gpio_panel_vadd =get_gpio_by_name ("EN_VREG_LCD_V3P3" ); +/* gpio pins set to -1 will not be used by the driver */ + pdata.gpio_bridge_reset =sfi_get_gpio_by_name ("LCMB_RXEN" ); + pdata.gpio_panel_bl_en =sfi_get_gpio_by_name ("6S6P_BL_EN" ); + pdata.gpio_panel_vadd =sfi_get_gpio_by_name ("EN_VREG_LCD_V3P3" ); -return &pdata; +return &pdata; }static const struct devs_id __initconst device_ids[] = {
@@ -984,7 +935,6 @@ static int __init sfi_parse_devs(struct sfi_table_header *table)static int __init mrst_platform_init (void ) { -sfi_table_parse (SFI_SIG_GPIO ,NULL ,NULL , sfi_parse_gpio);sfi_table_parse (SFI_SIG_DEVS ,NULL ,NULL , sfi_parse_devs);return 0 ; }
@@ -1033,7 +983,7 @@ static int __init pb_keys_init(void) num =sizeof (gpio_button) /sizeof (struct gpio_keys_button );for (i =0 ; i < num; i++) { - gb[i].gpio =get_gpio_by_name (gb[i].desc); + gb[i].gpio =sfi_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 )continue ;
Signature · 1 line
1.8.2.rc0.22.gb3600c3
Re: [PATCH, resend 3/3] x86: mrst: move to generic SFI GPIO API
Drop this one away, Sathyanarayanan Kuppuswamy takes care about it in his patchset.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Please, drop this one away.
Sathyanarayanan Kuppuswamy will take care of this in his patch series.