From patchwork Wed Feb 17 17:31:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Tissoires X-Patchwork-Id: 384641 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0B5C1C433E0 for ; Wed, 17 Feb 2021 17:35:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D175564DCF for ; Wed, 17 Feb 2021 17:35:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234504AbhBQRep (ORCPT ); Wed, 17 Feb 2021 12:34:45 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:25376 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234505AbhBQRdh (ORCPT ); Wed, 17 Feb 2021 12:33:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613583130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=L/SLrY6Dr+of38vaWIpXiDXossh0WQU+rKd8tehKfFM=; b=RgGXo6qH91KwuQDs/n/jJOuP3cuq62DJ5pOuSPjFQEgkRMjHxK38rtHn4fm0+jaih6fBw9 GIgkurcHYw901V4e0jknn6rXm7Q9qA/UMzFvF4PJlhRPvIxTDAYSQrKtBLu06G57NgZm0H 6TTMBi4uu/XiPj+wO1X3JPTkg06QRUk= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-589-Hx6TvH97OWiz_Mz-iszgTg-1; Wed, 17 Feb 2021 12:32:09 -0500 X-MC-Unique: Hx6TvH97OWiz_Mz-iszgTg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9CF23192CC55; Wed, 17 Feb 2021 17:32:06 +0000 (UTC) Received: from plouf.redhat.com (ovpn-116-25.ams2.redhat.com [10.36.116.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id ED2DA60C61; Wed, 17 Feb 2021 17:32:04 +0000 (UTC) From: Benjamin Tissoires To: Jiri Kosina , Roderick Colenbrander , =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= Cc: linux-input@vger.kernel.org, linux-leds@vger.kernel.org, linux-kernel@vger.kernel.org, Benjamin Tissoires Subject: [PATCH 01/11] Revert "HID: playstation: fix unused variable in ps_battery_get_property." Date: Wed, 17 Feb 2021 18:31:48 +0100 Message-Id: <20210217173158.3122868-2-benjamin.tissoires@redhat.com> In-Reply-To: <20210217173158.3122868-1-benjamin.tissoires@redhat.com> References: <20210217173158.3122868-1-benjamin.tissoires@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Precedence: bulk List-ID: X-Mailing-List: linux-leds@vger.kernel.org This reverts commit 3847d15b41ce ("HID: playstation: fix unused variable in ps_battery_get_property.") There is currently an ongoing discussion on linux-leds LKML, and so to give us more room, we need to revert those related LEDs patches from linux-next. To have a cleaner merge with the new version, we also revert all patches on top of the LED ones. This is not a big deal, they are still not pushed to Linus. Signed-off-by: Benjamin Tissoires --- drivers/hid/hid-playstation.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/hid/hid-playstation.c b/drivers/hid/hid-playstation.c index 408b651174cf..cc93c16cc822 100644 --- a/drivers/hid/hid-playstation.c +++ b/drivers/hid/hid-playstation.c @@ -391,7 +391,7 @@ static int ps_battery_get_property(struct power_supply *psy, uint8_t battery_capacity; int battery_status; unsigned long flags; - int ret = 0; + int ret; spin_lock_irqsave(&dev->lock, flags); battery_capacity = dev->battery_capacity; @@ -416,7 +416,7 @@ static int ps_battery_get_property(struct power_supply *psy, break; } - return ret; + return 0; } static int ps_device_register_battery(struct ps_device *dev)