aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/msi-laptop.c2
-rw-r--r--drivers/misc/sony-laptop.c4
-rw-r--r--drivers/misc/thinkpad_acpi.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/misc/msi-laptop.c b/drivers/misc/msi-laptop.c
index 349be934db7c..83679c762925 100644
--- a/drivers/misc/msi-laptop.c
+++ b/drivers/misc/msi-laptop.c
@@ -283,7 +283,7 @@ static struct platform_device *msipf_device;
283 283
284/* Initialization */ 284/* Initialization */
285 285
286static int dmi_check_cb(struct dmi_system_id *id) 286static int dmi_check_cb(const struct dmi_system_id *id)
287{ 287{
288 printk("msi-laptop: Identified laptop model '%s'.\n", id->ident); 288 printk("msi-laptop: Identified laptop model '%s'.\n", id->ident);
289 return 0; 289 return 0;
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
index d38ddce592c0..e73a71f04bb4 100644
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/misc/sony-laptop.c
@@ -807,7 +807,7 @@ static struct sony_nc_event *sony_nc_events;
807/* Vaio C* --maybe also FE*, N* and AR* ?-- special init sequence 807/* Vaio C* --maybe also FE*, N* and AR* ?-- special init sequence
808 * for Fn keys 808 * for Fn keys
809 */ 809 */
810static int sony_nc_C_enable(struct dmi_system_id *id) 810static int sony_nc_C_enable(const struct dmi_system_id *id)
811{ 811{
812 int result = 0; 812 int result = 0;
813 813
@@ -845,7 +845,7 @@ static struct sony_nc_event sony_C_events[] = {
845}; 845};
846 846
847/* SNC-only model map */ 847/* SNC-only model map */
848static struct dmi_system_id sony_nc_ids[] = { 848static const struct dmi_system_id sony_nc_ids[] = {
849 { 849 {
850 .ident = "Sony Vaio FE Series", 850 .ident = "Sony Vaio FE Series",
851 .callback = sony_nc_C_enable, 851 .callback = sony_nc_C_enable,
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index 0222bbaf7b76..6c0b2f0a51ab 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
@@ -4448,7 +4448,7 @@ static void ibm_exit(struct ibm_struct *ibm)
4448 4448
4449static void __init get_thinkpad_model_data(struct thinkpad_id_data *tp) 4449static void __init get_thinkpad_model_data(struct thinkpad_id_data *tp)
4450{ 4450{
4451 struct dmi_device *dev = NULL; 4451 const struct dmi_device *dev = NULL;
4452 char ec_fw_string[18]; 4452 char ec_fw_string[18];
4453 4453
4454 if (!tp) 4454 if (!tp)