Received: by 2002:a05:6a10:83d0:0:0:0:0 with SMTP id o16csp70249pxh; Thu, 7 Apr 2022 14:16:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzCrRYcGgV5hGh5yw47KzZBKdpIiFThX0iUi3x5c0lVGE3my5zgqTiX0GZr1G8qoFW9sNib X-Received: by 2002:a17:90b:1a89:b0:1c6:4398:673 with SMTP id ng9-20020a17090b1a8900b001c643980673mr18242611pjb.40.1649366173207; Thu, 07 Apr 2022 14:16:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649366173; cv=none; d=google.com; s=arc-20160816; b=YxLKExE8nuW5VuPM2VfYSGnxesA8I4FaMvjNQDiqeqq5rfp8kDm5ADvtmNIF7cihgz hCapH6SDNoX/9SxBcKNiJo306JFwhFFmJvfXb8WPipiqTiXLEmMxwDe1rVnZEzfxjARL 1dd5ky4P1Dr79YJtKyB7gysI7pMrKzQGw4RtHoGwJo6NfZgDCjLQ2Kv9VMGQxRN5w2cM O/2iEGe6LKBNA2A7RgrYvj4sl+wRa89bHeebNmZlK/ahGqCQ8tKbKVhofLoUcZX/neNk PvuDZfCiJKuSxxSk3T05NNo3YzywzNv+4Woz6+mgafP57MJwT3j4f2jbVo5WmCaS5rJG Di3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=4GpEztRIkAveORMD1xicC3J+iOHxwPWrt0IKf7Lg1m0=; b=OCPDWQABQT3f2sHTpXJD7t0+u91ATBNIp9ibMGLvFlMuTPXsKEIeFu/pscCZv9mhAC V0cLpKQA3JuzcRKy0VSbUyptzX4Sx47tlBAhN1Ce7BBWumUc1HA3lrKTqr1rtKY8jznn PkxuoaOIsFKQm0JTMdk4XMM+unzSRCfppSsBwH6vptAxlyksCZhYWSkUvSn+PdkBkuIN /7yH1ODxeKcfzqJYoi6WUjMPo/Roc7RwPG6Ts0jdXOnhIiMu84O4vKdxElZo2S6aSGHw +s87ANLmYiQ/nOW7smWLeIg4+6WAJOt+NSE89WQm3sTMMOb9Uhb/53u2hHcifr1mLzJ3 n3xA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id j73-20020a638b4c000000b0039cf321a6a8si688081pge.705.2022.04.07.14.16.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Apr 2022 14:16:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 97671464C33; Thu, 7 Apr 2022 13:08:18 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238988AbiDGL4N (ORCPT + 99 others); Thu, 7 Apr 2022 07:56:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233421AbiDGL4L (ORCPT ); Thu, 7 Apr 2022 07:56:11 -0400 Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0DBF6D0AAC; Thu, 7 Apr 2022 04:54:11 -0700 (PDT) Received: (Authenticated sender: hadess@hadess.net) by mail.gandi.net (Postfix) with ESMTPSA id 8D2F9C0008; Thu, 7 Apr 2022 11:54:07 +0000 (UTC) From: Bastien Nocera To: linux-input@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jiri Kosina , Benjamin Tissoires Subject: [PATCH] HID: wacom: Correct power_supply type Date: Thu, 7 Apr 2022 13:54:06 +0200 Message-Id: <20220407115406.115112-1-hadess@hadess.net> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RDNS_NONE, SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org POWER_SUPPLY_TYPE_USB seems to only ever be used by USB ports that are used to charge the machine itself (so a "system" scope), like the single USB port on a phone, rather than devices. The wacom_sys driver is the only driver that sets its device battery as being a USB type, which doesn't seem correct based on its usage, so switch it to be a battery type like all the other USB-connected devices. Signed-off-by: Bastien Nocera --- drivers/hid/wacom_sys.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index 066c567dbaa2..620fe74f5676 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c @@ -1777,7 +1777,7 @@ static int __wacom_initialize_battery(struct wacom *wacom, bat_desc->get_property = wacom_battery_get_property; sprintf(battery->bat_name, "wacom_battery_%ld", n); bat_desc->name = battery->bat_name; - bat_desc->type = POWER_SUPPLY_TYPE_USB; + bat_desc->type = POWER_SUPPLY_TYPE_BATTERY; bat_desc->use_for_apm = 0; ps_bat = devm_power_supply_register(dev, bat_desc, &psy_cfg); -- 2.35.1