From patchwork Tue Aug 18 17:26:49 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 42386 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n7IHQEN2001180 for ; Tue, 18 Aug 2009 17:26:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755066AbZHRR0J (ORCPT ); Tue, 18 Aug 2009 13:26:09 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755027AbZHRR0J (ORCPT ); Tue, 18 Aug 2009 13:26:09 -0400 Received: from ausc60pc101.us.dell.com ([143.166.85.206]:14383 "EHLO ausc60pc101.us.dell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754999AbZHRR0I (ORCPT ); Tue, 18 Aug 2009 13:26:08 -0400 X-Loopcount0: from 10.9.160.253 Message-ID: <4A8AE459.8060102@dell.com> Date: Tue, 18 Aug 2009 12:26:49 -0500 From: Mario Limonciello User-Agent: Thunderbird 2.0.0.22 (X11/20090804) MIME-Version: 1.0 To: Alan Jenkins CC: Marcel Holtmann , cezary.jackiewicz@gmail.com, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/3] Add rfkill support to compal-laptop References: <4A89E768.7010207@dell.com> <1250558643.30166.109.camel@localhost.localdomain> <9b2b86520908180044l72cb8642j6256e246662f7971@mail.gmail.com> <9b2b86520908180752k66feda09rf9034a96ac6ef470@mail.gmail.com> In-Reply-To: <9b2b86520908180752k66feda09rf9034a96ac6ef470@mail.gmail.com> X-Enigmail-Version: 0.95.7 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Hi Alan & Marcel: Alan Jenkins wrote: > Also, you're missing the calls to rfkill_destroy() here. > > Whew, I think that's everything. I hope you find the feedback useful, > despite it being a little fragmented. > > Thanks for all the feedback. I think i've addressed all of the concerns that were pointed out. I appreciate the pointer to scripts/cleanpatch, that does significantly help in finding whitespace problems that the naked eye just browses over. I'm attaching the updated patch (sorry, git send-email seems to still not be very graceful with line breaks when the SMTP implementation is exchange from what i've seen) --- compal-laptop.old 2009-08-18 00:17:43.056669380 -0500 +++ compal-laptop.c 2009-08-18 01:23:33.485833067 -0500 @@ -52,6 +52,7 @@ #include #include #include +#include #define COMPAL_DRIVER_VERSION "0.2.6" @@ -64,6 +65,10 @@ #define WLAN_MASK 0x01 #define BT_MASK 0x02 +static struct rfkill *wifi_rfkill; +static struct rfkill *bt_rfkill; +static struct platform_device *compal_device; + static int force; module_param(force, bool, 0); MODULE_PARM_DESC(force, "Force driver load, ignore DMI data"); @@ -89,6 +94,86 @@ return (int) result; } +static void compal_rfkill_poll(struct rfkill *rfkill, void *data) +{ + unsigned long radio = (unsigned long) data; + u8 result; + bool hw_blocked; + bool sw_blocked; + + ec_read(COMPAL_EC_COMMAND_WIRELESS, &result); + + hw_blocked = !(result & KILLSWITCH_MASK); + sw_blocked = (!hw_blocked && !(result & radio)); + + rfkill_set_states(rfkill, sw_blocked, hw_blocked); +} + +static int compal_rfkill_set(void *data, bool blocked) +{ + unsigned long radio = (unsigned long) data; + u8 result, value; + + ec_read(COMPAL_EC_COMMAND_WIRELESS, &result); + + if ((result & KILLSWITCH_MASK) == 0) + return -EINVAL; + + if (!blocked) + value = (u8) (result | radio); + else + value = (u8) (result & ~radio); + ec_write(COMPAL_EC_COMMAND_WIRELESS, value); + + return 0; +} + +static const struct rfkill_ops compal_rfkill_ops = { + .poll = compal_rfkill_poll, + .set_block = compal_rfkill_set, +}; + +static int setup_rfkill(void) +{ + int ret; + + wifi_rfkill = rfkill_alloc("compal-wifi", &compal_device->dev, + RFKILL_TYPE_WLAN, &compal_rfkill_ops, + (void *) WLAN_MASK); + if (!wifi_rfkill) { + ret = -ENOMEM; + goto err_wifi; + } + ret = rfkill_register(wifi_rfkill); + if (ret) { + rfkill_unregister(wifi_rfkill); + goto err_wifi; + } + + bt_rfkill = rfkill_alloc("compal-bluetooth", &compal_device->dev, + RFKILL_TYPE_BLUETOOTH, &compal_rfkill_ops, + (void *) BT_MASK); + if (!bt_rfkill) { + ret = -ENOMEM; + goto err_bt; + } + ret = rfkill_register(bt_rfkill); + if (ret) { + rfkill_unregister(bt_rfkill); + goto err_bt; + } + + return 0; + +err_bt: + rfkill_destroy(bt_rfkill); + +err_wifi: + rfkill_destroy(wifi_rfkill); + + return ret; +} + static int set_wlan_state(int state) { u8 result, value; @@ -258,8 +343,6 @@ } }; -static struct platform_device *compal_device; - /* Initialization */ static int dmi_check_cb(const struct dmi_system_id *id) @@ -389,6 +472,10 @@ if (ret) goto fail_platform_device2; + ret = setup_rfkill(); + if (ret) + printk(KERN_WARNING "compal-laptop: Unable to setup rfkill\n"); + printk(KERN_INFO "compal-laptop: driver "COMPAL_DRIVER_VERSION " successfully loaded.\n"); @@ -420,6 +507,10 @@ platform_device_unregister(compal_device); platform_driver_unregister(&compal_driver); backlight_device_unregister(compalbl_device); + rfkill_unregister(wifi_rfkill); + rfkill_destroy(wifi_rfkill); + rfkill_unregister(bt_rfkill); + rfkill_destroy(bt_rfkill); printk(KERN_INFO "compal-laptop: driver unloaded.\n"); }