From patchwork Wed Nov 16 14:22:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101517 Delivered-To: patch@linaro.org Received: by 10.140.97.165 with SMTP id m34csp181020qge; Wed, 16 Nov 2016 06:23:49 -0800 (PST) X-Received: by 10.99.99.195 with SMTP id x186mr8935016pgb.100.1479306229606; Wed, 16 Nov 2016 06:23:49 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q10si20957933pgf.264.2016.11.16.06.23.46; Wed, 16 Nov 2016 06:23:49 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753885AbcKPOXn (ORCPT + 26 others); Wed, 16 Nov 2016 09:23:43 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:60589 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752131AbcKPOXm (ORCPT ); Wed, 16 Nov 2016 09:23:42 -0500 Received: from wuerfel.lan ([78.43.21.235]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0MT82Y-1cFAJM0eeM-00SBNT; Wed, 16 Nov 2016 15:23:02 +0100 From: Arnd Bergmann To: Kishon Vijay Abraham I Cc: Arnd Bergmann , Heiko Stuebner , William Wu , Douglas Anderson , Frank Wang , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org Subject: [PATCH 1/2] phy: rockchip-inno-usb2: fix uninitialized tmout variable Date: Wed, 16 Nov 2016 15:22:38 +0100 Message-Id: <20161116142259.2123506-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:bgIS139WyZ7Goqs8kOlJ0bKzDA4eBXRvgB4rYsQwZFAUBiWnzNo 7knHhET2GNvuhnC/DUetGc9M/SjLUrSzPxf2c85GwlK+RSNmxdVrcKYI2MtvZKpebdf6Tlq GxsIXWsyzGD62ThqbHCmWWjsOovi4TpyLv2BLnTASyw/LBxTrXkALLCbACMyZF9A0QPL2gD ZoccrO1h/Ox5QO2Cw4l2Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:FcjFL18RT+4=:x6e5qYgWKmYtjxVD8jyLqw lmypGagl/W6zWqzZmmLxDrSdOakIwI0J/6ewcmZmPOQK1Oy5ijn3bizUYICaNL3V80l9ar0P8 plRwrK5il20O/YwC4YMZAej8ssKfJv7suCV643vnj1PmxgXbf2jogbQksHz1VI0FTu/Gh0BUc LNLJSlUwNX+Nq9QNnsW4UslQ5L1mMe8udtfBgdBpiUHDd6iLXrDdxCC7jPKDX0qV5Tmws5mPM XDWM2WmGdMF1rjAbgALQfn1yuto1vQ5yFJ4+f7WP9Wj2jD/rgplJcSgzsC0cb6v7lbK/WWXUq iA0BHTkYZ+Fb/hxRBe4jeSULGOYRCKwvzanupef5sCZc3JP2Q6qKZ1oJz7SZc0SvI9IUepmEW prm3WSJBdM7TIIDm9rWwABrbWckWEt8nAK6t/PONFM1uQgxm93uo1JSoxGo5ZQ8MO8m6nnms1 xpdk3030lU2gRcr93WiiAOmy+b31RuduMVZpGI3QXlLNRR1I+DI8EOcuPIXKDCU6moBoGxi+Z QUKIOPOgmq67kl678qmZm/uwbhyHjD9jPp+7L/5bTLkSLl5mU/Hmnr9gVdHdPw+698a8sRYaM Xa/nt1HBfW+sj3OGSW21rZNBGA9K4FPZdvA2CwVA9yeVJKN4k3VSRyRJq3wUFgggjyyosVN1Z pDde0Tq0wFFAifgR5XOROAwUwSKXGPc+S/oSFExSNFctQ0HDCLczBxRdpX3K2HmXqPBw= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The newly added OTG support has an obvious uninitialized variable access that gcc warns about: drivers/phy/phy-rockchip-inno-usb2.c: In function 'rockchip_chg_detect_work': drivers/phy/phy-rockchip-inno-usb2.c:717:7: error: 'tmout' may be used uninitialized in this function [-Werror=maybe-uninitialized] This replaces the use of the uninitialized variable with what the value was in the previous USB_CHG_STATE_WAIT_FOR_DCD state. Fixes: 0c42fe48fd23 ("phy: rockchip-inno-usb2: support otg-port for rk3399") Signed-off-by: Arnd Bergmann --- drivers/phy/phy-rockchip-inno-usb2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/phy/phy-rockchip-inno-usb2.c b/drivers/phy/phy-rockchip-inno-usb2.c index eb89de59b68f..2f99ec95079c 100644 --- a/drivers/phy/phy-rockchip-inno-usb2.c +++ b/drivers/phy/phy-rockchip-inno-usb2.c @@ -714,7 +714,7 @@ static void rockchip_chg_detect_work(struct work_struct *work) delay = CHG_SECONDARY_DET_TIME; rphy->chg_state = USB_CHG_STATE_PRIMARY_DONE; } else { - if (tmout) { + if (rphy->dcd_retries == CHG_DCD_MAX_RETRIES) { /* floating charger found */ rphy->chg_type = POWER_SUPPLY_TYPE_USB_DCP; rphy->chg_state = USB_CHG_STATE_DETECTED; From patchwork Wed Nov 16 14:22:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101516 Delivered-To: patch@linaro.org Received: by 10.140.97.165 with SMTP id m34csp181118qge; Wed, 16 Nov 2016 06:24:02 -0800 (PST) X-Received: by 10.99.227.81 with SMTP id o17mr8799116pgj.69.1479306242545; Wed, 16 Nov 2016 06:24:02 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y4si15679235pgc.54.2016.11.16.06.24.02; Wed, 16 Nov 2016 06:24:02 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932629AbcKPOXt (ORCPT + 26 others); Wed, 16 Nov 2016 09:23:49 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:55790 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753882AbcKPOXo (ORCPT ); Wed, 16 Nov 2016 09:23:44 -0500 Received: from wuerfel.lan ([78.43.21.235]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0Lo18K-1ciYn03JQO-00fw9t; Wed, 16 Nov 2016 15:23:26 +0100 From: Arnd Bergmann To: Kishon Vijay Abraham I Cc: Arnd Bergmann , Guenter Roeck , Heiko Stuebner , Shawn Lin , Frank Wang , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] phy: rockchip-inno-usb2: select USB_COMMON Date: Wed, 16 Nov 2016 15:22:39 +0100 Message-Id: <20161116142259.2123506-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20161116142259.2123506-1-arnd@arndb.de> References: <20161116142259.2123506-1-arnd@arndb.de> X-Provags-ID: V03:K0:fzcdV7BD8mkkfk0mhbF8cjSFMFcirqkrnVBtohYYC8/FG5bVAWK vEWhPzldk+Laq/Luw6WQm3NtupvBFU0gwbc6PisoSRp3wKZDhJIUX/uJgGNlumf8uSd3oSF gjpordY3MKb9OwySc6eLLQHKz7f4LgtdA4ilN81i4niuUAEb0MZQ7zw1UM6DYDabQXUsFLe 6CSodpmZpJ2xlw31CEIVQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:1Uy1xoBEqdE=:yCbcjgmt1j9mmvekZLPxKo Ay2FYDSd4aDU4I8et4k9cEr+evEMNSp8fa2o/eRNEhP44dglXQwo67jTYvHkbI+Bh4hHWv5sD zlFLgtxuVxBHFEX76YGQ2sse6mGDi5F63Gt9ORtfyahZlWyuCx5z980Dz5L2fVgB5yPu9+Src OjXCA8bCVQ87QnzvoasGJUNKXpEOa8iAYd9bCWmc6LNVtQyrtgCyaNXKm7JnTs1EkImNWB4gF MoOhazI44uJh4owHk9rMaHDOXpN+zF+RfaFjdmZatA8Bod6lvfQ/tmDcg73VWABYhgBQBHhHM 0rELr7lZnqVJlJeqyw27lDOkWeGXnqGbHm0ANI/RCoyZ3Z9ZIy46t21Ze3lWrR5n5VBlDx53d e1vD05xRdh7qPIdCD6Z4BLN4UyVxDGeLMQaJGmFM2jmG2UJ/worxfZU3zi9hBLQAPfZ1GIPuX L9Q59DGShFXEO0lUA2uvoGpcZ/bFc5qr8rT+hGqBh8MYm1Cu+wtA6CZaKhmmUrLiphlz06DOS k2dg3tiFz1SmoWl0F0rf65X95s9Y2IXEKDukPfu+zWT+fIYAQESgUOencmzfwHJJ+zfmEKOBU mV7VF++hD39whCh9A+RMdmRWGqx18h2/9KvTAbof1joxQOZSWTwQlVrMNnJwYzewyfAK8EzIJ 5Q6uot4zGYX+/9GJWftBls9uA8MGKXlniN7GxfCHkqmD0B7jZnO/8YaIHw01vpINk9YM= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When USB is disabled, we get a link error for this driver because of the added OTG support drivers/phy/phy-rockchip-inno-usb2.o: In function `rockchip_usb2phy_otg_sm_work': phy-rockchip-inno-usb2.c:(.text.rockchip_usb2phy_otg_sm_work+0x1f4): undefined reference to `usb_otg_state_string' drivers/phy/phy-rockchip-inno-usb2.o: In function `rockchip_usb2phy_probe': phy-rockchip-inno-usb2.c:(.text.rockchip_usb2phy_probe+0x2c8): undefined reference to `of_usb_get_dr_mode_by_phy' Other phy drivers select USB_COMMON for this, so let's do the same here. Fixes: 0c42fe48fd23 ("phy: rockchip-inno-usb2: support otg-port for rk3399") Signed-off-by: Arnd Bergmann --- drivers/phy/Kconfig | 2 ++ 1 file changed, 2 insertions(+) -- 2.9.0 diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig index 13411960895f..53cab9f3323b 100644 --- a/drivers/phy/Kconfig +++ b/drivers/phy/Kconfig @@ -365,7 +365,9 @@ config PHY_ROCKCHIP_INNO_USB2 tristate "Rockchip INNO USB2PHY Driver" depends on (ARCH_ROCKCHIP || COMPILE_TEST) && OF depends on COMMON_CLK + depends on USB_SUPPORT select GENERIC_PHY + select USB_COMMON help Support for Rockchip USB2.0 PHY with Innosilicon IP block.