Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3d94d70 authored by Mathias Krause's avatar Mathias Krause Committed by Darren Hart
Browse files

ideapad-laptop: Constify DMI table for real! 

This is a follow-up patch to commit 49458e83 ("ideapad-laptop:
Constify DMI table and other r/o variables") to do what its commit
message says. The actual commit differs from the patch posted at
https://www.mail-archive.com/platform-driver-x86@vger.kernel.org/msg05340.html


significantly, probably due to a bad merge conflict resolution. Fix up
the mess and constify the DMI table for real and fix the bogus
double-const of ideapad_rfk_data[].

Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarMathias Krause <minipli@googlemail.com>
Cc: Matthew Garrett <matthew.garrett@nebula.com>
Cc: Ike Panhc <ike.pan@canonical.com>
Signed-off-by: default avatarDarren Hart <dvhart@linux.intel.com>
parent 3b264d27

drivers/platform/x86/ideapad-laptop.c

+2 −2
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ struct ideapad_rfk_data { 
	int type;

};



const const struct ideapad_rfk_data ideapad_rfk_data[] = {

static const struct ideapad_rfk_data ideapad_rfk_data[] = {

	{ "ideapad_wlan",    CFG_WIFI_BIT, VPCCMD_W_WIFI, RFKILL_TYPE_WLAN },

	{ "ideapad_bluetooth", CFG_BT_BIT, VPCCMD_W_BT, RFKILL_TYPE_BLUETOOTH },

	{ "ideapad_3g",        CFG_3G_BIT, VPCCMD_W_3G, RFKILL_TYPE_WWAN },
@@ -829,7 +829,7 @@ static void ideapad_acpi_notify(acpi_handle handle, u32 event, void *data) 
 * always results in 0 on these models, causing ideapad_laptop to wrongly

 * report all radios as hardware-blocked.

 */

static struct dmi_system_id no_hw_rfkill_list[] = {

static const struct dmi_system_id no_hw_rfkill_list[] = {

	{

		.ident = "Lenovo Yoga 2 11 / 13 / Pro",

		.matches = {