diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-04-03 14:12:48 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:14:45 +0200 |
| commit | 50fd6a7495baca957da6983d93303f887a17a4dc (patch) | |
| tree | bfa5f4b02718127409c3ef05fef6819da71308a4 | |
| parent | 7cdb5a4160badad6f6bd63d3dcf343330838aa64 (diff) | |
ux500: Fix warnings
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
| -rw-r--r-- | drivers/input/keyboard/stmpe-keypad.c | 2 | ||||
| -rw-r--r-- | drivers/spi/stm_msp.c | 4 | ||||
| -rw-r--r-- | include/linux/mfd/stmpe.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/keyboard/stmpe-keypad.c b/drivers/input/keyboard/stmpe-keypad.c index a01a18f5735..6b3d2ea44e6 100644 --- a/drivers/input/keyboard/stmpe-keypad.c +++ b/drivers/input/keyboard/stmpe-keypad.c @@ -449,7 +449,7 @@ static const struct dev_pm_ops stmpe_keypad_dev_pm_ops = { static struct platform_driver stmpe_keypad_driver = { .driver.name = "stmpe-keypad", .driver.owner = THIS_MODULE, -#if CONFIG_PM +#ifdef CONFIG_PM .driver.pm = &stmpe_keypad_dev_pm_ops, #endif .probe = stmpe_keypad_probe, diff --git a/drivers/spi/stm_msp.c b/drivers/spi/stm_msp.c index 1fdcdc1f325..65dc316b37b 100644 --- a/drivers/spi/stm_msp.c +++ b/drivers/spi/stm_msp.c @@ -1669,7 +1669,7 @@ err_first_setup: return status; } -static int __init stm_msp_probe(struct amba_device *adev, struct amba_id *id) +static int __init stm_msp_probe(struct amba_device *adev, const struct amba_id *id) { struct device *dev = &adev->dev; struct stm_msp_controller *platform_info = adev->dev.platform_data; @@ -1900,7 +1900,7 @@ static struct amba_id stm_msp_ids[] = { }, }; -static struct amba_driver stm_msp_driver = { +static struct amba_driver __refdata stm_msp_driver = { .drv = { .name = "MSP", }, diff --git a/include/linux/mfd/stmpe.h b/include/linux/mfd/stmpe.h index e762c270d8d..a05f03b16bf 100644 --- a/include/linux/mfd/stmpe.h +++ b/include/linux/mfd/stmpe.h @@ -106,7 +106,7 @@ struct matrix_keymap_data; * @no_autorepeat: disable key autorepeat */ struct stmpe_keypad_platform_data { - struct matrix_keymap_data *keymap_data; + const struct matrix_keymap_data *keymap_data; unsigned int debounce_ms; unsigned int scan_count; bool no_autorepeat; |