From patchwork Thu Jun 25 11:25:40 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Chary X-Patchwork-Id: 32366 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 n5PBN81V019557 for ; Thu, 25 Jun 2009 11:23:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752611AbZFYLXF (ORCPT ); Thu, 25 Jun 2009 07:23:05 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752344AbZFYLXF (ORCPT ); Thu, 25 Jun 2009 07:23:05 -0400 Received: from iksaif.net ([88.191.73.63]:54902 "EHLO iksaif.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752004AbZFYLXB (ORCPT ); Thu, 25 Jun 2009 07:23:01 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) (Authenticated sender: corentincj@iksaif.net) by iksaif.net (Postfix) with ESMTPA id 1592EC9002E; Thu, 25 Jun 2009 13:25:45 +0200 (CEST) From: Corentin Chary To: lenb@kernel.org Cc: linux-acpi@vger.kernel.org, Corentin Chary Subject: [PATCH 5/7] eeepc-laptop: makes get_acpi() returns -ENODEV Date: Thu, 25 Jun 2009 13:25:40 +0200 Message-Id: <1245929142-3354-5-git-send-email-corentincj@iksaif.net> X-Mailer: git-send-email 1.6.3.1 In-Reply-To: <1245929142-3354-4-git-send-email-corentincj@iksaif.net> References: <1245929142-3354-1-git-send-email-corentincj@iksaif.net> <1245929142-3354-2-git-send-email-corentincj@iksaif.net> <1245929142-3354-3-git-send-email-corentincj@iksaif.net> <1245929142-3354-4-git-send-email-corentincj@iksaif.net> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org If there is there is no getter defined, get_acpi() will return -ENODEV. Signed-off-by: Corentin Chary --- drivers/platform/x86/eeepc-laptop.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c index 5b102c2..19cc9ae 100644 --- a/drivers/platform/x86/eeepc-laptop.c +++ b/drivers/platform/x86/eeepc-laptop.c @@ -289,7 +289,7 @@ static int set_acpi(int cm, int value) static int get_acpi(int cm) { - int value = -1; + int value = -ENODEV; if ((ehotk->cm_supported & (0x1 << cm))) { const char *method = cm_getv[cm]; if (method == NULL) @@ -367,13 +367,19 @@ static ssize_t store_sys_acpi(int cm, const char *buf, size_t count) rv = parse_arg(buf, count, &value); if (rv > 0) - set_acpi(cm, value); + value = set_acpi(cm, value); + if (value < 0) + return value; return rv; } static ssize_t show_sys_acpi(int cm, char *buf) { - return sprintf(buf, "%d\n", get_acpi(cm)); + int value = get_acpi(cm); + + if (value < 0) + return value; + return sprintf(buf, "%d\n", value); } #define EEEPC_CREATE_DEVICE_ATTR(_name, _cm) \ @@ -1036,8 +1042,9 @@ static int eeepc_new_rfkill(struct rfkill **rfkill, { int result; - if (get_acpi(cm) == -1) - return -ENODEV; + result = get_acpi(cm); + if (result < 0) + return result; *rfkill = rfkill_alloc(name, dev, type, &eeepc_rfkill_ops, (void *)(unsigned long)cm);