From patchwork Fri Feb 15 12:45:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 14875 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 1AE9823E2E for ; Fri, 15 Feb 2013 12:47:00 +0000 (UTC) Received: from mail-ve0-f174.google.com (mail-ve0-f174.google.com [209.85.128.174]) by fiordland.canonical.com (Postfix) with ESMTP id 9A102A197C4 for ; Fri, 15 Feb 2013 12:46:59 +0000 (UTC) Received: by mail-ve0-f174.google.com with SMTP id pb11so2983990veb.5 for ; Fri, 15 Feb 2013 04:46:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=QPUHNbYvyXPOfacgFSJf4btt5pcAnSYG50CXGx7s1YM=; b=mC4GpmNXm1VHYv2VUcD+7TQ398TpA1EPN7uliKs7yORbZPoHgpUHA1dMsBxEes4H/j hA+BcawuUIbHyYjugC9HgepVEwIfJdmRCzmc6w8BkN0uyWoitOsFjZxEQCJzsUeAVt8y Ga0879u1mV2clfUTqAV+sPdWYb5Jg1retivklq2TLYfbbo7ppiPTMqKSmX/IHe94lnSe IRaaMgxCZwaDPRrle+lKr7rvMPw2nR3Ax9/Ax9Es0EUFhWq33F0U98jRxmGvIGGclQyh RjebToUs7UHCmW5BCzsruVzn1vcVUnC6WJ226Y9jandKrB1jkUrad0I5tEsOlEQ9ifLz WSiA== X-Received: by 10.220.240.141 with SMTP id la13mr2841584vcb.39.1360932419139; Fri, 15 Feb 2013 04:46:59 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.221.4.5 with SMTP id oa5csp10902vcb; Fri, 15 Feb 2013 04:46:58 -0800 (PST) X-Received: by 10.180.97.233 with SMTP id ed9mr5593315wib.32.1360932408306; Fri, 15 Feb 2013 04:46:48 -0800 (PST) Received: from mail-we0-x231.google.com ([2a00:1450:400c:c03::231]) by mx.google.com with ESMTPS id i4si5767754wjb.63.2013.02.15.04.46.47 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 15 Feb 2013 04:46:48 -0800 (PST) Received-SPF: neutral (google.com: 2a00:1450:400c:c03::231 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c03::231; Authentication-Results: mx.google.com; spf=neutral (google.com: 2a00:1450:400c:c03::231 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-we0-f177.google.com with SMTP id d7so2823756wer.8 for ; Fri, 15 Feb 2013 04:46:47 -0800 (PST) X-Received: by 10.194.94.37 with SMTP id cz5mr3890462wjb.49.1360932407884; Fri, 15 Feb 2013 04:46:47 -0800 (PST) Received: from localhost.localdomain (cpc34-aztw25-2-0-cust250.18-1.cable.virginmedia.com. [86.16.136.251]) by mx.google.com with ESMTPS id bs6sm5133904wib.4.2013.02.15.04.46.45 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 15 Feb 2013 04:46:46 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, cbouatmailru@gmail.com, sameo@linux.intel.com, Rupesh Kumar , Lee Jones Subject: [PATCH 30/40] pm2301-charger: Removed unused code from PM2301 driver Date: Fri, 15 Feb 2013 12:45:00 +0000 Message-Id: <1360932310-30065-31-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1360932310-30065-1-git-send-email-lee.jones@linaro.org> References: <1360932310-30065-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQlI6IcmbW1/KzSaBtJ4krJwtqY55jhdQQDiz0FV/a7YNKyf8opsi+cHJIR8CvUbmgNXfQUG From: Rupesh Kumar Some of the headers and defines accrued over time are no longer in use. Let's take the opportunity to remove a few of them. Signed-off-by: Rupesh Kumar Signed-off-by: Lee Jones Reviewed-by: Marcus COOPER Reviewed-by: Philippe LANGLAIS --- drivers/power/pm2301_charger.c | 5 ----- drivers/power/pm2301_charger.h | 22 ---------------------- 2 files changed, 27 deletions(-) diff --git a/drivers/power/pm2301_charger.c b/drivers/power/pm2301_charger.c index 2cc92ec..cb1c953 100644 --- a/drivers/power/pm2301_charger.c +++ b/drivers/power/pm2301_charger.c @@ -16,16 +16,12 @@ #include #include #include -#include #include #include #include #include -#include -#include #include #include -#include #include #include #include @@ -1018,7 +1014,6 @@ static int __devinit pm2xxx_wall_charger_probe(struct i2c_client *i2c_client, /* get parent data */ pm2->dev = &i2c_client->dev; - pm2->gpadc = ab8500_gpadc_get("ab8500-gpadc.0"); pm2->pm2_int = &pm2xxx_int; diff --git a/drivers/power/pm2301_charger.h b/drivers/power/pm2301_charger.h index fad1f38..8ce3cc0 100644 --- a/drivers/power/pm2301_charger.h +++ b/drivers/power/pm2301_charger.h @@ -9,27 +9,6 @@ #ifndef PM2301_CHARGER_H #define PM2301_CHARGER_H -#define MAIN_WDOG_ENA 0x01 -#define MAIN_WDOG_KICK 0x02 -#define MAIN_WDOG_DIS 0x00 -#define CHARG_WD_KICK 0x01 -#define MAIN_CH_ENA 0x01 -#define MAIN_CH_NO_OVERSHOOT_ENA_N 0x02 -#define MAIN_CH_DET 0x01 -#define MAIN_CH_CV_ON 0x04 -#define OTP_ENABLE_WD 0x01 - -#define MAIN_CH_INPUT_CURR_SHIFT 4 - -#define LED_INDICATOR_PWM_ENA 0x01 -#define LED_INDICATOR_PWM_DIS 0x00 -#define LED_IND_CUR_5MA 0x04 -#define LED_INDICATOR_PWM_DUTY_252_256 0xBF - -/* HW failure constants */ -#define MAIN_CH_TH_PROT 0x02 -#define MAIN_CH_NOK 0x01 - /* Watchdog timeout constant */ #define WD_TIMER 0x30 /* 4min */ #define WD_KICK_INTERVAL (30 * HZ) @@ -495,7 +474,6 @@ struct pm2xxx_charger { int failure_input_ovv; unsigned int lpn_pin; struct pm2xxx_interrupts *pm2_int; - struct ab8500_gpadc *gpadc; struct regulator *regu; struct pm2xxx_bm_data *bat; struct mutex lock;