Path: csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Newsgroups: linux.kernel Subject: [PATCH v2 08/16] dell-smbios: return the SMBIOS buffer from dell_smbios_get_buffer() Date: Fri, 22 Jan 2016 15:30:02 +0100 Message-ID: References: X-Original-To: Darren Hart , Matthew Garrett , =?UTF-8?q?Pali=20Roh=C3=A1r?= , Richard Purdie , Jacek Anaszewski Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kempniu.pl; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=z+cxs0SU67qCDZhW5qSbKkfbdxRZTW0flDBuAvrFZaw=; b=Du0PgpzejlxFxDD1myUsQxUlXqkEsjeLeLc/3eQ1GQHi2JH69g5lZ/HVt4FBPmpe7U M0ETYjdf5X+Z6WCU9XIHXwfaHsWZYmNQRPpK5xCUGJBOF4xrFhC4l2p9/vFwCtBrB0bn lLAJB0TTIH7q486NuPflkY2FHLKILuxa0/xxI= X-Google-Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=z+cxs0SU67qCDZhW5qSbKkfbdxRZTW0flDBuAvrFZaw=; b=ksGxWWpZJ1AiLMyEmRG7XyEzMYd6/Kg8pInfBC5jc1khy+i+bVPK+zNSbiSvjtXc0D sxLX/Oz4KP/JbNJjir2N3iFENGW8VN4E8cXnou+kEuPFz6NRvTSRKpwAexpS2iORs4b+ 4oH6tA1p2x+TNdeljYPJn8oF/wXSNEzHNH/e4fQoNLuxG0yEzFwtA5ATciFyNHb3b+w7 SZ459e+NgORPldEnBEOAa+7HXFKeFWa4GI7LkJ0MhrbT0XIVsCA7Y/JMIaC19gkAIdh4 JtEPJabmUa/Uh8ZcCNR5twIIrNJOrwzsrrq6ym90wcpOd0eK5E7w02dDG0uJLLcLZwSL Q0XA== X-Gm-Message-State: AG10YOQXXcxR5AEG0pfEKDcBQ6U4Gy1NFYMyNatKl37xNrrQubBlutP83qxX2UnASDElcQ== X-Received: by 10.25.83.193 with SMTP id h184mr1351051lfb.6.1453472870541; Fri, 22 Jan 2016 06:27:50 -0800 (PST) X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 279 Organization: linux.* mail to news gateway X-Original-Cc: platform-driver-x86@vger.kernel.org, linux-leds@vger.kernel.org, linux-kernel@vger.kernel.org X-Original-Date: Fri, 22 Jan 2016 15:27:20 +0100 X-Original-Message-ID: <1453472848-3118-9-git-send-email-kernel@kempniu.pl> X-Original-References: <1453472848-3118-1-git-send-email-kernel@kempniu.pl> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: csiph.com linux.kernel:1315027 Ultimately, the SMBIOS buffer should not be exported from dell-smbios. Currently, dell-laptop accesses it directly using a global variable, so make dell_smbios_get_buffer() return a pointer to the SMBIOS buffer and replace all uses of the global variable with local variables. Signed-off-by: Michał Kępień --- drivers/platform/x86/dell-laptop.c | 49 +++++++++++++++++++++++------------- drivers/platform/x86/dell-smbios.c | 3 ++- drivers/platform/x86/dell-smbios.h | 2 +- 3 files changed, 35 insertions(+), 19 deletions(-) diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c index 0bb2211..5b200f2 100644 --- a/drivers/platform/x86/dell-laptop.c +++ b/drivers/platform/x86/dell-laptop.c @@ -409,6 +409,7 @@ static inline int dell_smi_error(int value) static int dell_rfkill_set(void *data, bool blocked) { + struct calling_interface_buffer *buffer; int disable = blocked ? 1 : 0; unsigned long radio = (unsigned long)data; int hwswitch_bit = (unsigned long)data - 1; @@ -416,7 +417,7 @@ static int dell_rfkill_set(void *data, bool blocked) int status; int ret; - dell_smbios_get_buffer(); + buffer = dell_smbios_get_buffer(); dell_smbios_send_request(17, 11); ret = buffer->output[0]; @@ -451,7 +452,8 @@ static int dell_rfkill_set(void *data, bool blocked) /* Must be called with the buffer held */ static void dell_rfkill_update_sw_state(struct rfkill *rfkill, int radio, - int status) + int status, + struct calling_interface_buffer *buffer) { if (status & BIT(0)) { /* Has hw-switch, sync sw_state to BIOS */ @@ -474,12 +476,13 @@ static void dell_rfkill_update_hw_state(struct rfkill *rfkill, int radio, static void dell_rfkill_query(struct rfkill *rfkill, void *data) { + struct calling_interface_buffer *buffer; int radio = ((unsigned long)data & 0xF); int hwswitch; int status; int ret; - dell_smbios_get_buffer(); + buffer = dell_smbios_get_buffer(); dell_smbios_send_request(17, 11); ret = buffer->output[0]; @@ -514,12 +517,13 @@ static struct dentry *dell_laptop_dir; static int dell_debugfs_show(struct seq_file *s, void *data) { + struct calling_interface_buffer *buffer; int hwswitch_state; int hwswitch_ret; int status; int ret; - dell_smbios_get_buffer(); + buffer = dell_smbios_get_buffer(); dell_smbios_send_request(17, 11); ret = buffer->output[0]; @@ -613,11 +617,12 @@ static const struct file_operations dell_debugfs_fops = { static void dell_update_rfkill(struct work_struct *ignored) { + struct calling_interface_buffer *buffer; int hwswitch = 0; int status; int ret; - dell_smbios_get_buffer(); + buffer = dell_smbios_get_buffer(); dell_smbios_send_request(17, 11); ret = buffer->output[0]; @@ -637,16 +642,17 @@ static void dell_update_rfkill(struct work_struct *ignored) if (wifi_rfkill) { dell_rfkill_update_hw_state(wifi_rfkill, 1, status, hwswitch); - dell_rfkill_update_sw_state(wifi_rfkill, 1, status); + dell_rfkill_update_sw_state(wifi_rfkill, 1, status, buffer); } if (bluetooth_rfkill) { dell_rfkill_update_hw_state(bluetooth_rfkill, 2, status, hwswitch); - dell_rfkill_update_sw_state(bluetooth_rfkill, 2, status); + dell_rfkill_update_sw_state(bluetooth_rfkill, 2, status, + buffer); } if (wwan_rfkill) { dell_rfkill_update_hw_state(wwan_rfkill, 3, status, hwswitch); - dell_rfkill_update_sw_state(wwan_rfkill, 3, status); + dell_rfkill_update_sw_state(wwan_rfkill, 3, status, buffer); } out: @@ -694,6 +700,7 @@ static struct notifier_block dell_laptop_rbtn_notifier = { static int __init dell_setup_rfkill(void) { + struct calling_interface_buffer *buffer; int status, ret, whitelisted; const char *product; @@ -709,7 +716,7 @@ static int __init dell_setup_rfkill(void) if (!force_rfkill && !whitelisted) return 0; - dell_smbios_get_buffer(); + buffer = dell_smbios_get_buffer(); dell_smbios_send_request(17, 11); ret = buffer->output[0]; status = buffer->output[1]; @@ -866,6 +873,7 @@ static void dell_cleanup_rfkill(void) static int dell_send_intensity(struct backlight_device *bd) { + struct calling_interface_buffer *buffer; int token; int ret; @@ -873,7 +881,7 @@ static int dell_send_intensity(struct backlight_device *bd) if (token == -1) return -ENODEV; - dell_smbios_get_buffer(); + buffer = dell_smbios_get_buffer(); buffer->input[0] = token; buffer->input[1] = bd->props.brightness; @@ -890,6 +898,7 @@ static int dell_send_intensity(struct backlight_device *bd) static int dell_get_intensity(struct backlight_device *bd) { + struct calling_interface_buffer *buffer; int token; int ret; @@ -897,7 +906,7 @@ static int dell_get_intensity(struct backlight_device *bd) if (token == -1) return -ENODEV; - dell_smbios_get_buffer(); + buffer = dell_smbios_get_buffer(); buffer->input[0] = token; if (power_supply_is_system_supplied() > 0) @@ -1154,10 +1163,11 @@ static bool kbd_led_present; static int kbd_get_info(struct kbd_info *info) { + struct calling_interface_buffer *buffer; u8 units; int ret; - dell_smbios_get_buffer(); + buffer = dell_smbios_get_buffer(); buffer->input[0] = 0x0; dell_smbios_send_request(4, 11); @@ -1243,9 +1253,10 @@ static int kbd_set_level(struct kbd_state *state, u8 level) static int kbd_get_state(struct kbd_state *state) { + struct calling_interface_buffer *buffer; int ret; - dell_smbios_get_buffer(); + buffer = dell_smbios_get_buffer(); buffer->input[0] = 0x1; dell_smbios_send_request(4, 11); @@ -1274,9 +1285,10 @@ static int kbd_get_state(struct kbd_state *state) static int kbd_set_state(struct kbd_state *state) { + struct calling_interface_buffer *buffer; int ret; - dell_smbios_get_buffer(); + buffer = dell_smbios_get_buffer(); buffer->input[0] = 0x2; buffer->input[1] = BIT(state->mode_bit) & 0xFFFF; buffer->input[1] |= (state->triggers & 0xFF) << 16; @@ -1313,6 +1325,7 @@ static int kbd_set_state_safe(struct kbd_state *state, struct kbd_state *old) static int kbd_set_token_bit(u8 bit) { + struct calling_interface_buffer *buffer; int id; int ret; @@ -1323,7 +1336,7 @@ static int kbd_set_token_bit(u8 bit) if (id == -1) return -EINVAL; - dell_smbios_get_buffer(); + buffer = dell_smbios_get_buffer(); buffer->input[0] = da_tokens[id].location; buffer->input[1] = da_tokens[id].value; dell_smbios_send_request(1, 0); @@ -1335,6 +1348,7 @@ static int kbd_set_token_bit(u8 bit) static int kbd_get_token_bit(u8 bit) { + struct calling_interface_buffer *buffer; int id; int ret; int val; @@ -1346,7 +1360,7 @@ static int kbd_get_token_bit(u8 bit) if (id == -1) return -EINVAL; - dell_smbios_get_buffer(); + buffer = dell_smbios_get_buffer(); buffer->input[0] = da_tokens[id].location; dell_smbios_send_request(0, 0); ret = buffer->output[0]; @@ -1972,6 +1986,7 @@ static void kbd_led_exit(void) static int __init dell_init(void) { + struct calling_interface_buffer *buffer; int max_intensity = 0; int token; int ret; @@ -2017,7 +2032,7 @@ static int __init dell_init(void) token = find_token_location(BRIGHTNESS_TOKEN); if (token != -1) { - dell_smbios_get_buffer(); + buffer = dell_smbios_get_buffer(); buffer->input[0] = token; dell_smbios_send_request(0, 2); if (buffer->output[0] == 0) diff --git a/drivers/platform/x86/dell-smbios.c b/drivers/platform/x86/dell-smbios.c index b10c613..535d382 100644 --- a/drivers/platform/x86/dell-smbios.c +++ b/drivers/platform/x86/dell-smbios.c @@ -40,10 +40,11 @@ static int da_num_tokens; struct calling_interface_token *da_tokens; EXPORT_SYMBOL_GPL(da_tokens); -void dell_smbios_get_buffer(void) +struct calling_interface_buffer *dell_smbios_get_buffer(void) { mutex_lock(&buffer_mutex); dell_smbios_clear_buffer(); + return buffer; } EXPORT_SYMBOL_GPL(dell_smbios_get_buffer); diff --git a/drivers/platform/x86/dell-smbios.h b/drivers/platform/x86/dell-smbios.h index 80b5048..f7a51f5 100644 --- a/drivers/platform/x86/dell-smbios.h +++ b/drivers/platform/x86/dell-smbios.h @@ -38,7 +38,7 @@ struct calling_interface_token { extern struct calling_interface_buffer *buffer; extern struct calling_interface_token *da_tokens; -void dell_smbios_get_buffer(void); +struct calling_interface_buffer *dell_smbios_get_buffer(void); void dell_smbios_clear_buffer(void); void dell_smbios_release_buffer(void); void dell_smbios_send_request(int class, int select); -- 1.7.10.4