diff options
author | Brian Wood <brian.j.wood@intel.com> | 2015-10-30 08:58:15 -0700 |
---|---|---|
committer | Bruce Beare <bruce.j.beare@intel.com> | 2015-11-18 16:54:35 -0800 |
commit | aee979674867ea25a9f87c341513ea36c9444d33 (patch) | |
tree | 095476d368938c373e90ae6c8cf30e1228055620 | |
parent | ddb9fd16e0b4da5e33dd9f3254d0f14768d086a5 (diff) | |
download | edison-v3.10-aee979674867ea25a9f87c341513ea36c9444d33.tar.gz |
Resolve kernel compilation warnings
This commit resolves the compile warnings seen
when building the Intel Edison 3.10.x kernel.
BUG=25764172
Change-Id: I655f702b24f9bcfb7655c57acfd8aafa69c52c0d
Signed-off-by: Brian Wood <brian.j.wood@intel.com>
-rw-r--r-- | arch/x86/platform/intel-mid/device_libs/platform_spidev.h | 2 | ||||
-rw-r--r-- | arch/x86/platform/intel-mid/intel_soc_pm_debug.c | 2 | ||||
-rw-r--r-- | drivers/gpio/gpiodebug.c | 10 | ||||
-rw-r--r-- | drivers/misc/stm.c | 2 | ||||
-rw-r--r-- | drivers/net/usb/cdc_subset.c | 3 | ||||
-rw-r--r-- | drivers/platform/x86/intel_scu_ipcutil.c | 2 | ||||
-rw-r--r-- | drivers/power/bq24261_charger.c | 2 | ||||
-rw-r--r-- | drivers/power/pmic_ccsm.c | 6 | ||||
-rw-r--r-- | drivers/power/power_supply_core.c | 2 | ||||
-rw-r--r-- | drivers/watchdog/intel-mid_wdt.c | 6 | ||||
-rw-r--r-- | include/linux/iio/iio.h | 1 | ||||
-rw-r--r-- | include/net/ping.h | 3 | ||||
-rw-r--r-- | kernel/auditfilter.c | 2 | ||||
-rw-r--r-- | net/ipv4/ping.c | 3 | ||||
-rw-r--r-- | net/ipv6/ping.c | 3 |
15 files changed, 30 insertions, 19 deletions
diff --git a/arch/x86/platform/intel-mid/device_libs/platform_spidev.h b/arch/x86/platform/intel-mid/device_libs/platform_spidev.h index a40ef8ff29a..6ae0db259c5 100644 --- a/arch/x86/platform/intel-mid/device_libs/platform_spidev.h +++ b/arch/x86/platform/intel-mid/device_libs/platform_spidev.h @@ -14,7 +14,9 @@ /* REVERT ME workaround[MRFL] for invalid bus number in IAFW .25 */ #define FORCE_SPI_BUS_NUM 5 +#ifndef FORCE_CHIP_SELECT #define FORCE_CHIP_SELECT 1 +#endif extern void *spidev_platform_data(void *info) __attribute__((weak)); #endif diff --git a/arch/x86/platform/intel-mid/intel_soc_pm_debug.c b/arch/x86/platform/intel-mid/intel_soc_pm_debug.c index 8ce4c81de4e..5cbcb891287 100644 --- a/arch/x86/platform/intel-mid/intel_soc_pm_debug.c +++ b/arch/x86/platform/intel-mid/intel_soc_pm_debug.c @@ -115,7 +115,7 @@ static int show_pmu_s0ix_lat(struct seq_file *s, void *unused) seq_printf(s, "%29s %35s\n", "SCU Latency", "OS Latency"); seq_printf(s, "%33s %35s\n", "min/avg/max(msec)", "min/avg/max(msec)"); - for (i = SYS_STATE_S0I1; i <= SYS_STATE_S3; i++) { + for (i = SYS_STATE_S0I1; i < SYS_STATE_S3; i++) { seq_printf(s, "\n%s(%llu)", states[i - SYS_STATE_S0I1], lat_stat->count[i]); diff --git a/drivers/gpio/gpiodebug.c b/drivers/gpio/gpiodebug.c index cc5159b50bb..b83e1fcad43 100644 --- a/drivers/gpio/gpiodebug.c +++ b/drivers/gpio/gpiodebug.c @@ -229,9 +229,9 @@ static ssize_t gpio_conf_write(struct file *filp, const char __user *ubuf, ssize_t ret = 0; struct gpiodebug_data *data = filp->private_data; struct gpio_debug *debug = data->debug; - int i, gpio = data->gpio; + int i, gpio = data->gpio, err; char *buf, *start; - unsigned int value; + unsigned long int value; ret = cnt; @@ -254,7 +254,11 @@ static ssize_t gpio_conf_write(struct file *filp, const char __user *ubuf, for (i = cnt - 1; i > 0 && isspace(buf[i]); i--) buf[i] = 0; - kstrtoul(start, 16, &value); + err = kstrtoul(start, 16, &value); + if (err) { + pr_warn("kstrtoul() failed with errno: %d\n", err); + return err; + } if (debug->ops->set_conf_reg) debug->ops->set_conf_reg(debug, gpio, value); diff --git a/drivers/misc/stm.c b/drivers/misc/stm.c index 58b35ef6650..be96b32ccd3 100644 --- a/drivers/misc/stm.c +++ b/drivers/misc/stm.c @@ -385,7 +385,7 @@ int stm_dev_init(struct pci_dev *pdev, __func__, __LINE__, retval); return retval; } - pr_info("stm add %x\n", stm->stm_addr); + pr_info("stm add %lx\n", stm->stm_addr); stm->stm_reg_base = stm->stm_addr+STM_REG_BASE; stm->stm_ioaddr = ioremap_nocache((u32)stm->stm_reg_base, diff --git a/drivers/net/usb/cdc_subset.c b/drivers/net/usb/cdc_subset.c index 0d1fe89ae0b..49fe1fcf988 100644 --- a/drivers/net/usb/cdc_subset.c +++ b/drivers/net/usb/cdc_subset.c @@ -222,10 +222,9 @@ static const struct driver_info blob_info = { #endif /* CONFIG_USB_ARMLINUX */ - /*-------------------------------------------------------------------------*/ -#ifndef HAVE_HARDWARE +#ifndef HAVE_HARDWARE #warning You need to configure some hardware for this driver #endif diff --git a/drivers/platform/x86/intel_scu_ipcutil.c b/drivers/platform/x86/intel_scu_ipcutil.c index 7b8ed849c23..024bbafc1a3 100644 --- a/drivers/platform/x86/intel_scu_ipcutil.c +++ b/drivers/platform/x86/intel_scu_ipcutil.c @@ -807,7 +807,7 @@ static long scu_ipc_ioctl(struct file *fp, unsigned int cmd, int intel_scu_ipc_get_oshob_base(void) { if (oshob_info == NULL) - return NULL; + return 0; return oshob_info->oshob_base; } diff --git a/drivers/power/bq24261_charger.c b/drivers/power/bq24261_charger.c index 0f621e177b9..373ad8f99af 100644 --- a/drivers/power/bq24261_charger.c +++ b/drivers/power/bq24261_charger.c @@ -1244,7 +1244,7 @@ static void bq24261_wdt_reset_worker(struct work_struct *work) ret = bq24261_reset_timer(chip); if (ret) - dev_err(&chip->client->dev, "Error (%d) in WDT reset\n"); + dev_err(&chip->client->dev, "Error (%d) in WDT reset\n", ret); else dev_info(&chip->client->dev, "WDT reset\n"); diff --git a/drivers/power/pmic_ccsm.c b/drivers/power/pmic_ccsm.c index 87ae3da5a4e..c7c99543bfb 100644 --- a/drivers/power/pmic_ccsm.c +++ b/drivers/power/pmic_ccsm.c @@ -241,7 +241,7 @@ static int pmic_write_reg(u16 addr, u8 *val) { int ret; - ret = intel_scu_ipc_iowrite8(addr, val); + ret = intel_scu_ipc_iowrite8(addr, *val); if (ret) { dev_err(chc.dev, "Error in intel_scu_ipc_ioread8 0x%.4x\n", addr); @@ -1005,9 +1005,9 @@ int pmic_get_battery_voltage(int *vol) { long tmp; int ret; - u8 val; + u8 val = GPADCREG_VIBATT_REQ; - ret = pmic_write_reg(GPADCREQ_ADDR_BC, GPADCREG_VIBATT_REQ); + ret = pmic_write_reg(GPADCREQ_ADDR_BC, &val); if (ret != 0) { dev_err(chc.dev, "Error writing GPADCREQ_ADDR_BC-register\n"); diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c index 83e5a030b65..26fbc8496e9 100644 --- a/drivers/power/power_supply_core.c +++ b/drivers/power/power_supply_core.c @@ -415,7 +415,7 @@ static void power_supply_dev_release(struct device *dev) #ifdef CONFIG_THERMAL static int power_supply_read_temp(struct thermal_zone_device *tzd, - unsigned long *temp) + long *temp) { struct power_supply *psy; union power_supply_propval val; diff --git a/drivers/watchdog/intel-mid_wdt.c b/drivers/watchdog/intel-mid_wdt.c index 0ed95f5dcc4..9dffc53f340 100644 --- a/drivers/watchdog/intel-mid_wdt.c +++ b/drivers/watchdog/intel-mid_wdt.c @@ -44,7 +44,8 @@ enum { static inline int wdt_command(int sub, u8 *in, int inlen) { - return intel_scu_ipc_command(IPC_WATCHDOG, (u32 *)sub, in, (u32 *)inlen, NULL, 0); + return intel_scu_ipc_command(IPC_WATCHDOG, (u32)sub, in, (u32)inlen, + NULL, 0); } static int wdt_start(struct watchdog_device *wd) @@ -57,7 +58,8 @@ static int wdt_start(struct watchdog_device *wd) u32 timeout; } ipc_wd_start = { timeout - MID_WDT_PRETIMEOUT, timeout }; - ret = wdt_command(SCU_WATCHDOG_START, (u8 *)&ipc_wd_start, sizeof(ipc_wd_start)); + ret = wdt_command(SCU_WATCHDOG_START, (u8 *)&ipc_wd_start, + sizeof(ipc_wd_start)); if (ret) { struct device *dev = watchdog_get_drvdata(wd); dev_crit(dev, "error starting watchdog: %d\n", ret); diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h index cc343e44644..0ae14f8011f 100644 --- a/include/linux/iio/iio.h +++ b/include/linux/iio/iio.h @@ -13,6 +13,7 @@ #include <linux/device.h> #include <linux/cdev.h> #include <linux/iio/types.h> +#include <linux/iio/consumer.h> /* IIO TODO LIST */ /* * Provide means of adjusting timer accuracy. diff --git a/include/net/ping.h b/include/net/ping.h index 2db4860e584..d9ec5151285 100644 --- a/include/net/ping.h +++ b/include/net/ping.h @@ -31,7 +31,8 @@ /* Compatibility glue so we can support IPv6 when it's compiled as a module */ struct pingv6_ops { - int (*ipv6_recv_error)(struct sock *sk, struct msghdr *msg, int len); + int (*ipv6_recv_error)(struct sock *sk, struct msghdr *msg, int len, + int *addr_len); int (*ip6_datagram_recv_ctl)(struct sock *sk, struct msghdr *msg, struct sk_buff *skb); int (*icmpv6_err_convert)(u8 type, u8 code, int *err); diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c index 6bd4a90d199..358dd23de4e 100644 --- a/kernel/auditfilter.c +++ b/kernel/auditfilter.c @@ -423,7 +423,7 @@ static struct audit_entry *audit_data_to_entry(struct audit_rule_data *data, f->lsm_rule = NULL; /* Support legacy tests for a valid loginuid */ - if ((f->type == AUDIT_LOGINUID) && (f->val == 4294967295)) { + if ((f->type == AUDIT_LOGINUID) && (f->val == 4294967295UL)) { f->type = AUDIT_LOGINUID_SET; f->val = 0; } diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c index c3d44c1065b..ab3d86aa571 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -872,7 +872,8 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, return ip_recv_error(sk, msg, len, addr_len); #if IS_ENABLED(CONFIG_IPV6) } else if (family == AF_INET6) { - return pingv6_ops.ipv6_recv_error(sk, msg, len); + return pingv6_ops.ipv6_recv_error(sk, msg, len, + addr_len); #endif } } diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c index 857201f4936..fc05fdc890a 100644 --- a/net/ipv6/ping.c +++ b/net/ipv6/ping.c @@ -57,7 +57,8 @@ static struct inet_protosw pingv6_protosw = { /* Compatibility glue so we can support IPv6 when it's compiled as a module */ -int dummy_ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len) +int dummy_ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len, + int *addr_len) { return -EAFNOSUPPORT; } |