From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756909AbcLTTJj (ORCPT ); Tue, 20 Dec 2016 14:09:39 -0500 Received: from mail-he1eur01on0132.outbound.protection.outlook.com ([104.47.0.132]:16174 "EHLO EUR01-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756481AbcLTTI7 (ORCPT ); Tue, 20 Dec 2016 14:08:59 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peda@axentia.se; From: Peter Rosin To: linux-kernel@vger.kernel.org Cc: Peter Rosin , Sebastian Reichel , linux-pm@vger.kernel.org Subject: [PATCH 3/3] power: supply: bq24735: always check for AC adapter presence in probe Date: Tue, 20 Dec 2016 12:33:02 +0100 Message-Id: <1482233582-29770-4-git-send-email-peda@axentia.se> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1482233582-29770-1-git-send-email-peda@axentia.se> References: <1482233582-29770-1-git-send-email-peda@axentia.se> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [217.210.101.82] X-ClientProxiedBy: DB5PR0101CA0002.eurprd01.prod.exchangelabs.com (10.165.200.140) To DB6PR0201MB2312.eurprd02.prod.outlook.com (10.169.222.151) X-MS-Office365-Filtering-Correlation-Id: 85d166eb-5aeb-4960-1f66-08d428cc03cc X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:DB6PR0201MB2312; X-Microsoft-Exchange-Diagnostics: 1;DB6PR0201MB2312;3:o3NMLZoyu/A3CbuYAyz9a858Vg4KhN1trjnWTbtvh54qIjPdx6RPe1ifa9qfOQiGEbAcLyLBFSupsBAiZsZnCgqL1VM1T8E9ubcL+ancHvx2WR1cL+wbGIfigjrA+CWDFpEL7dMG/dN1AXYaARLp0302XnMKjL9bqa6pZbhHjcC1O7lOOHQb5JemxaOZuNQAOww3nxAK0fPMAW3T4pJL4cBKA2Jpcqe+aOGj4nGdeaR7uX9/JuTeGVz+0JpdONgdoePTbI1ElVcm4q+vwt7DeQ== X-Microsoft-Exchange-Diagnostics: 1;DB6PR0201MB2312;25:P0BNSLPLVcTV12DGIEAYRsULD5AU7369ErYCxG/Fa+kDudZfaWp4OElzgwuMslUq3wgbKDYkMoXVYETsIBbrqg/HyqCtDs2lUSaPSejY5vCUIT4owrkEiyTgjDw1Yqec+NXSogvkFcwl8ah5u+qE4eJ3OlVMPGAdKBLtCiJhCimsVjOGrnj0L4oC1VE7Pem1AKPDc6CnDdbVNyn0XhxmdpMhHE1e2v0/9YtJanHH2h8dnZpoucDDAcTBwzv69rdPl5wBZPRoBYT5gGaCA2NpGSQCgeNQ1GUJouMrsnUCI3SbSID9ou167i4ByMzuzI6741VgP0mRro+VcCpLH/D16wsVtNyZg+jQJThdeu2FmfjRHGyMvM2swmH8MtKDTyK3OkphNERIAg6pe3a3+PGrthH/wDMhATomTOTG7Hi8X88SlM0ff9DUGG4SOOrsom2M4u7eX4vBR7nXVu63bSkVcDCotZxTs70tQia+a7ujCwq9QTKqoEWL7FOzNHTIo4o40GSdrkSgR/VfngNyn9Vi4VYVUH7UYFVpUDH1yhydNaYW86EJAqosQwc2aV919oo+x7Wf3GxX7D0CDMYW4/S6Oa8oj+UoqIOwS+NmRSCQsKMVzKaqTU4wSzrxqth97vnH3XYwRedfdpb50urFZk22goLuXYo6AzqJR4uu9h8tUAXfhpHhOxhb31VFB0WH5Pj5yJxpaogy+hFBSOX3Sy8epn74z1uL5vQE1TE30qZz5RfU5VIB7KcXGD9bX/wYNIFn7nBsnl+4eQiq86gOPYweoA== X-Microsoft-Exchange-Diagnostics: 1;DB6PR0201MB2312;31:kI910gD9U1sg+C393HwAk9qyjGcAVD1kQe4xOxleBlQWKl0wmWStHzj0EPz104Qr/a4V0oZrW6Ux60os8qih5fXvDHBiX/lTgUBJxa3BgrpG3W4aRpJ4b69BIFOkUEBlBd+Ud37TP4yfw1mzBEE/FUGND1tmFizQ6WB4l8hpRccYoMgG2+7/VhBkEIeGs754OJJ1qfxuz39u/6WFNAiLdiyI+jPkTmHh1CPK74PiiRMIuTkzZHd/SqRuq11N5Tkgrl0ByhnmMbWKIq5w/9v70uiYigBV8s/Eqg0p8yuXzjE=;4:sOUu+eBLJTxVQ7IykMixpR5CF/S7s5vM1eHfFerki8bJ7i1zOJymrKu1xgOvZ2aCyZlB1Bbjkx/oo3UOC13RdRYSDvrvs1pCWyvg5Q3K1vmHFRXJewhiOtB0BdrTHhRjk64KgFPmH4NODX946Kw+fDRqxFk0xZX5geGRlSAvP6nu8gBl1++HETz0+/ujIkRd/3KINOaF1cBAoZl5HQhlf5DB584/CR/mLyMH8PS5SgHGeRrtCxRwQQAAvHQ7CQoTsz4tfGXGs/M+2psYdjdHCRG3s3L4rbY2I1R0gVN1u8uxfs2nrfmrpbdH0hDmsBwhNkru2o4qYvMny9FhewSCJeWecvrWxO2IPOzPt/DO4O4f5asyrvyGh4trHPtMRbS2U/tJOmEJVRV1YOA31FrPXh1uHzJ03/1ADFaHBg/jxPlD4B1DViwQhj47EUcLfvNuqV4TG59Eq33Q0CMVdyil+lJQFSfQuYEg6V14ACL7yse2Om7WUki+OogHOgPtox2ULQNC8paW5wCH8xLtSrOUu+Rxv8JMNZZIoDOuAuWew3vADJg4DivkEypxXMYNy0MxHMyX53z7RLyDnyHHxj1RzF1GtYd8I070r7c9PHryagrTDYObFJq1xzQBqHr8Nhaa X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6041248)(20161123562025)(20161123564025)(2016111802025)(20161123560025)(20161123555025)(6072148)(6043046);SRVR:DB6PR0201MB2312;BCL:0;PCL:0;RULEID:;SRVR:DB6PR0201MB2312; X-Forefront-PRVS: 0162ACCC24 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6069001)(6009001)(7916002)(39830400002)(39450400003)(39410400002)(189002)(199003)(6916009)(86362001)(2351001)(97736004)(6486002)(2906002)(6506006)(101416001)(6512006)(2361001)(92566002)(7736002)(25786008)(305945005)(50226002)(68736007)(38730400001)(106356001)(8676002)(42186005)(81166006)(48376002)(50466002)(74482002)(36756003)(5660300001)(76176999)(4326007)(33646002)(81156014)(50986999)(66066001)(3846002)(189998001)(6666003)(110136003)(5003940100001)(6116002)(2950100002)(47776003)(105586002)(42262002);DIR:OUT;SFP:1102;SCL:1;SRVR:DB6PR0201MB2312;H:localhost.localdomain;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DB6PR0201MB2312;23:ihEk+Z6l6KFVWaGzi79o4IzTh769IQDvzZ8r8Gi?= =?us-ascii?Q?ezWFBKZS6fCWR2YQMX0WLYmLEIH7YJGV66WaLtC/SSCsYGo9JL1N4lwUzRTC?= =?us-ascii?Q?peRtYvio0onmOfBi9fhSRZ2XRwKAXuA2pCKCaHz23SxfWjjDYQz0bYvBCSls?= =?us-ascii?Q?nl2ENNHZ/2tw/8KVTKWc/r8C8XsDcnlSc7pCcOmzEJvFtxYBtZ8ltvziR7Fa?= =?us-ascii?Q?FpW1zNUBmZ0U7ujnmDOzyvvRF0wAARD9dtlzqzQjYWypnnFxlTUXZs4UqiPV?= =?us-ascii?Q?28Fxlagy1ejy8/P2q1+XVnw8UrcUGhlYzgE2153Osvg0Ks2WqEZzlDUCYnot?= =?us-ascii?Q?MsOFIXb3s0Q4FgND9altPaIbnaBraKe67B+1Y4VFQSQsbcTXVYquynKYBQXP?= =?us-ascii?Q?C6PteRS46GMBoFTUL9ptv/0Hvmlz9xhU4/rNwKxJc1W3s43clUngpZr/4ohU?= =?us-ascii?Q?PKR5jW0rJHJ9tvNmgaNL7rV3O2o60rEqdhwikd54DtwrDYVsnLgE0pVITlAo?= =?us-ascii?Q?XqMd5NpTkq6yo5uk1VJ2y6A0TKj8rNDiWBgxWaXNoPQJKZ5osBH0Kef0Uj2y?= =?us-ascii?Q?eVE9XnAbpDuF04OMPZNWAskCpfngrsnfHWrlE2NslRI/KOBoZzOfxxdor1dV?= =?us-ascii?Q?TKsg6c6OWpKaI/mNdwuSAsTDwua99F6QHR32FqX08qe1pNkfqj9fV750+2OE?= =?us-ascii?Q?d94RkyXl7Vl3Hf6CzWacIrfoENeQkarkH/c9MKO6dIRNEKIyWRLMweT98je9?= =?us-ascii?Q?l8IZEZraE3fab9NaHI7xpAcLSToi+CYl1sAT/R0v/XhGIl6TLjXVgBGUAxsr?= =?us-ascii?Q?RGB2yG5riIKZH1yQ3YoIs2RGvCVWRGjbCSgrx7jRuTQ9FYHdyV/45mnG3P90?= =?us-ascii?Q?wa31Hg+M4Dm7YHrxArsvVCenf/7XCKImatdvbf8yYa8aMkzTQMI1ZvQkGGvk?= =?us-ascii?Q?GRZj9JSrO4Uz/guxJuibdfZLlBOZedKEy6w3XJftIPJldZh3g/HJNuGDGmwS?= =?us-ascii?Q?8e6C0TWLN14WID2WiUeag0E/EH5LWg7q+p7YC5x0aJQPAbfMXk2yh+f3bZWF?= =?us-ascii?Q?bpnq8fWiTkgphzORS90eQwPoa+QOrPUWT/zp0UjIVpRHz0K5Nh0ztmtG0R+0?= =?us-ascii?Q?Ev6FOTf+YwHoaqv4s64qusFihoUMzRGK390vN5yEFTxHpsLJmw00A6RARdzk?= =?us-ascii?Q?RdlkpXnC17AI0a3PhdMItQvi5TKXILeF3Bti60uHA6+or6SXGihcRQDaJcA?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;DB6PR0201MB2312;6:9slGjPuuEgMmWZ3Ir2Hw0OHDDi9dvcmGVX92qPT+At3NoqlVNxnH8HM3LE15FXkY0ubxDp21omq+PXN4RfDNH1vgMb9MDkYSGf+kDgO9AkFR7PD4Xv1Lmsd0xtY5IsbyPRpih5BWCXoMr/P4w/+pxgLZpGuZbGelR7Gvf0sk9I6tjO2Uupf9HiCP6McIJR5mPT+UgC1vG5zyUHa1KukuB/oLIDtBDKFt+G4/w/oh5DQT5I2+fxxIIsjc0R+fjJnJsP8qv63kMLDcmrKq9N0hhZugWYS8pEz1jc4oMnsLUacLY7PWyGKhs1yGl63cJcgA2hPu1J2A8AcJBKWSKxaw+d71sTntz2dayiCfkHbGDuNQtIIlVPbzpHUxZ1/nVWiIZ1lmnfej/9DSRn3ZDXriwP+WpdL0zHt7PsdLzHH2iGb6JnoviWkBxz7e761PUNOc;5:hI6oeyzISHljgx7jIy2laRDcUDhujnid6fIl/PEFHnUDPr7KbAFtuZSFo06wDB8FS1deefx7GwXna93dmC7HmIuU1uxqgaG9Oz/HYBLBI9TARbKGV1b7Xqq2Dacw5l13sdjmv5/TyN6EWhonEAN8Qg==;24:VCJRQaHSwjVtF1LyEBgUvTjtq12XWfDpX/J+7C3igzS8+kzE4HKR/HZAM62A75Dr4mfMO9aVNSvjLO1pvvOEo/2EpSpB4tfYO+scK8G9RJs= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DB6PR0201MB2312;7:icHFt488pqE3RtFzzjUJ11f4Ce9bbTWlHN5gjh5IjZzURQ/JgvpUbbAGV+7VBB8yVf7w5bCQvojGBBdMsUr9DD7JolHsPORfmu2cCmT6e0C1TLCA+GPm8PYrMNnXtVYywk0e+v5EdqBX0nHauGk/EWCP8s8L3hiqGRgJnRyzTiyQwhgFi7lxIRf3OBDSXVd6Scz5511g0qv9ErqnInD61oc7ZFYf1X4MQycQlIkWVwrP1rLxYM1m7tdLFu+5gGhFhP5shOIGzamBF9v/n2Tvo4hrjmmRowZpRbB4avp3KNuPOSn7FcYCKW0kmuI5gvACFNKX3EuCHlOBB3XUjhvDNjzB9vq4ow9zU72mijn9HeSMq8BZsFRG7PghIsWQ8ddEeDqFglZBSujXx07k9XI0Dy+hwOXz4/+GtXezgFKD9Xz2Gm6paaEoizbDnRHj24SDF9CM1fv99U+Nanu72QeCSg== X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Dec 2016 11:33:26.1905 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0201MB2312 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org So what if there is a status_gpio specified? bq24735_charger_is_present() do have a working fallback for the case of no status_gpio. Simplify this by not special casing setups w/o status_gpio, folding two consecutive if-blocks in the process. Signed-off-by: Peter Rosin --- drivers/power/supply/bq24735-charger.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/power/supply/bq24735-charger.c b/drivers/power/supply/bq24735-charger.c index 71f977d055d7..4f6275e5cf1c 100644 --- a/drivers/power/supply/bq24735-charger.c +++ b/drivers/power/supply/bq24735-charger.c @@ -416,7 +416,7 @@ static int bq24735_charger_probe(struct i2c_client *client, return ret; } - if (!charger->status_gpio || bq24735_charger_is_present(charger)) { + if (bq24735_charger_is_present(charger)) { ret = bq24735_read_word(client, BQ24735_MANUFACTURER_ID); if (ret < 0) { dev_err(&client->dev, "Failed to read manufacturer id : %d\n", @@ -437,10 +437,7 @@ static int bq24735_charger_probe(struct i2c_client *client, "device id mismatch. 0x000b != 0x%04x\n", ret); return -ENODEV; } - } - /* check for AC adapter presence */ - if (bq24735_charger_is_present(charger)) { ret = bq24735_enable_charging(charger); if (ret < 0) { dev_err(&client->dev, "Failed to enable charging\n"); -- 2.1.4