From patchwork Sat Jun 27 01:12:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 6683981 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1317D9F1C1 for ; Sat, 27 Jun 2015 01:13:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 46372205DE for ; Sat, 27 Jun 2015 01:13:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 63C9F205DF for ; Sat, 27 Jun 2015 01:13:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751788AbbF0BM5 (ORCPT ); Fri, 26 Jun 2015 21:12:57 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:43085 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751954AbbF0BMu (ORCPT ); Fri, 26 Jun 2015 21:12:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=roeck-us.net; s=default; h=Message-Id:Date:Subject:Cc:To:From; bh=D64sRr1AX5UZzeB6eQepRTR4ygBa7xVq9kekfJnA+g8=; b=EfqoNP2a0t3EKMi/w3BJ4a1NuXSxwvCjJtP4PIn+lOmx4ra8P2r/8Jxr6zRGd5U+vvysfSwHvxNrrEZRDM4j6toYzCNlNWqN9PNEN8xnJVkF7lSoeA09AmxE96kKVvTr9eA4qbOiCoS5NSys5JDNVYQpd8TO52omgKlKX32xHTA=; Received: from 108-223-40-66.lightspeed.sntcca.sbcglobal.net ([108.223.40.66]:50624 helo=localhost) by bh-25.webhostbox.net with esmtpa (Exim 4.85) (envelope-from ) id 1Z8efm-002NIm-7O; Sat, 27 Jun 2015 01:12:46 +0000 From: Guenter Roeck To: Sebastian Reichel Cc: Dmitry Eremin-Solenikov , David Woodhouse , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Guenter Roeck , Chanwoo Choi , Ramakrishna Pallala Subject: [PATCH] power: axp288_charger: Fix broken extcon API calls Date: Fri, 26 Jun 2015 18:12:44 -0700 Message-Id: <1435367564-12900-1-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.1.0 X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: guenter@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable 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 The extcon API calls have been changed to add an additional argument. This causes build errors such as drivers/power/axp288_charger.c:851:2: error: too few arguments to function 'extcon_register_notifier' Fixes: 73b6ecdb93e8 ("extcon: Redefine the unique id of supported external connectors without 'enum extcon' type") Fixes: 046050f6e623 ("extcon: Update the prototype of extcon_register_notifier() with enum extcon") Cc: Chanwoo Choi Cc: Ramakrishna Pallala Signed-off-by: Guenter Roeck --- drivers/power/axp288_charger.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/power/axp288_charger.c b/drivers/power/axp288_charger.c index 5680317f4823..0aa6e7fd25d4 100644 --- a/drivers/power/axp288_charger.c +++ b/drivers/power/axp288_charger.c @@ -848,7 +848,8 @@ static int axp288_charger_probe(struct platform_device *pdev) /* Register for extcon notification */ INIT_WORK(&info->cable.work, axp288_charger_extcon_evt_worker); info->cable.nb.notifier_call = axp288_charger_handle_cable_evt; - ret = extcon_register_notifier(info->cable.edev, &info->cable.nb); + ret = extcon_register_notifier(info->cable.edev, EXTCON_NONE, + &info->cable.nb); if (ret) { dev_err(&info->pdev->dev, "failed to register extcon notifier %d\n", ret); @@ -909,7 +910,8 @@ intr_reg_failed: extcon_unregister_interest(&info->otg.cable); power_supply_unregister(info->psy_usb); psy_reg_failed: - extcon_unregister_notifier(info->cable.edev, &info->cable.nb); + extcon_unregister_notifier(info->cable.edev, EXTCON_NONE, + &info->cable.nb); return ret; } @@ -920,7 +922,8 @@ static int axp288_charger_remove(struct platform_device *pdev) if (info->otg.cable.edev) extcon_unregister_interest(&info->otg.cable); - extcon_unregister_notifier(info->cable.edev, &info->cable.nb); + extcon_unregister_notifier(info->cable.edev, EXTCON_NONE, + &info->cable.nb); power_supply_unregister(info->psy_usb); return 0;