From patchwork Mon Mar 10 11:47:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandr Mezin X-Patchwork-Id: 3802461 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B937DBF540 for ; Mon, 10 Mar 2014 11:50:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E1FB62024F for ; Mon, 10 Mar 2014 11:50:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EDA3920213 for ; Mon, 10 Mar 2014 11:50:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753149AbaCJLuE (ORCPT ); Mon, 10 Mar 2014 07:50:04 -0400 Received: from mail-la0-f41.google.com ([209.85.215.41]:55240 "EHLO mail-la0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752829AbaCJLuD (ORCPT ); Mon, 10 Mar 2014 07:50:03 -0400 Received: by mail-la0-f41.google.com with SMTP id gl10so4637541lab.0 for ; Mon, 10 Mar 2014 04:50:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=XJQl9x9MjAjlg5QA6ZPF2OtWstAN/7kE9LOES6j1XJc=; b=AbGHCVVziXigrXp8VBcJtdaJ2gJqy7AEcozfw0vn//HZO/3oUTBCGs6UTiTAudk5g8 hy21YdNilNWCvSFVZ3F81TV5snbxSrzdDSHSqxQzOXBKpSaMuBfJ+UBrpIZHoP+lxRGZ tgvB9iYiDK4XbfiDaKtxd6U87lcJfI+0gh1amM2EGv52l5gbr+KHNAbAnJgYm1lboxdR EzOA5wjU4oA5R23xXTyoBrO0MXHNTevCOQvojzKfK+vjMWFkF6A7NqrdjuSfg+q6SsDp c6dXHf09AGHMFPv1ntW0B8MlaJCDggwTbnPlpI7+xKjNZgfeXFcfy7hIWhrVe0qme3ce pUOg== X-Received: by 10.152.19.7 with SMTP id a7mr717850lae.16.1394452201402; Mon, 10 Mar 2014 04:50:01 -0700 (PDT) Received: from localhost.localdomain ([109.194.125.245]) by mx.google.com with ESMTPSA id jl8sm21397626lbc.16.2014.03.10.04.49.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 10 Mar 2014 04:50:00 -0700 (PDT) From: Alexander Mezin To: linux-acpi@vger.kernel.org Cc: Alexander Mezin Subject: [PATCH 1/3] ACPI / battery: move definition ACPI_BATTERY_CLASS to header Date: Mon, 10 Mar 2014 18:47:39 +0700 Message-Id: <1394452061-27777-1-git-send-email-mezin.alexander@gmail.com> X-Mailer: git-send-email 1.9.0 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP ACPI_BATTERY_CLASS is used in multiple places. Create a header file for it, and replace copies with #include. Signed-off-by: Alexander Mezin Acked-by: Lan Tianyu --- drivers/acpi/battery.c | 3 ++- drivers/acpi/battery.h | 6 ++++++ drivers/acpi/sbs.c | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 drivers/acpi/battery.h diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 797a693..0a19c8f 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c @@ -39,11 +39,12 @@ #include #include +#include "battery.h" + #define PREFIX "ACPI: " #define ACPI_BATTERY_VALUE_UNKNOWN 0xFFFFFFFF -#define ACPI_BATTERY_CLASS "battery" #define ACPI_BATTERY_DEVICE_NAME "Battery" #define ACPI_BATTERY_NOTIFY_STATUS 0x80 #define ACPI_BATTERY_NOTIFY_INFO 0x81 diff --git a/drivers/acpi/battery.h b/drivers/acpi/battery.h new file mode 100644 index 0000000..785373c --- /dev/null +++ b/drivers/acpi/battery.h @@ -0,0 +1,6 @@ +#ifndef __ACPI_BATTERY_H +#define __ACPI_BATTERY_H + +#define ACPI_BATTERY_CLASS "battery" + +#endif diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c index dbd4849..366ca40 100644 --- a/drivers/acpi/sbs.c +++ b/drivers/acpi/sbs.c @@ -37,12 +37,12 @@ #include #include "sbshc.h" +#include "battery.h" #define PREFIX "ACPI: " #define ACPI_SBS_CLASS "sbs" #define ACPI_AC_CLASS "ac_adapter" -#define ACPI_BATTERY_CLASS "battery" #define ACPI_SBS_DEVICE_NAME "Smart Battery System" #define ACPI_SBS_FILE_INFO "info" #define ACPI_SBS_FILE_STATE "state"