From patchwork Thu Aug 16 10:22:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Brugger X-Patchwork-Id: 1330641 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 60D46DF280 for ; Thu, 16 Aug 2012 10:24:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755718Ab2HPKWx (ORCPT ); Thu, 16 Aug 2012 06:22:53 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:47847 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755197Ab2HPKWZ (ORCPT ); Thu, 16 Aug 2012 06:22:25 -0400 Received: by wibhr14 with SMTP id hr14so529330wib.1 for ; Thu, 16 Aug 2012 03:22:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=2aEeL1muovEevdIKlgOLoBnc5xeWK+epxyZMQjP0znM=; b=FCA2mYkboVSXwNeNiEr4K3GTdg1jdMxBrLJUHaqyc6yYIGRE+skffw7Rnx6hwh4/tY nt1ffkuQdXpZnaDrMoXUTEJsmuRQIAEo71nmW4X8g8iLpEVNEMP4+L21oKrpkvlk+0uu wpFyv2nQ3/QLTSNQHpmOTfypPA6vhiN2go9r55I5Z2U4qDFHyto0IOF8nRJxJRqHLZJ9 fDtnjPvk2DUptDKse7Q/ma8f1fLzzTbwZNqelpwYKaYY+uhqvXZMSVpWbCvvuvQqAoBg wQbZREddWRpcPYj/VrNAhqkeb7xUKU2dQdGUud6lew3WFGz+FCtERD9nNNJvOXjuBN8v dc2w== Received: by 10.180.82.230 with SMTP id l6mr4803988wiy.21.1345112544549; Thu, 16 Aug 2012 03:22:24 -0700 (PDT) Received: from localhost.localdomain (249.Red-80-33-164.staticIP.rima-tde.net. [80.33.164.249]) by mx.google.com with ESMTPS id cu1sm3088124wib.6.2012.08.16.03.22.23 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 16 Aug 2012 03:22:23 -0700 (PDT) From: Matthias Brugger To: Felipe Balbi , Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Matthias Brugger Subject: [PATCH] usb/musb/omap2430.c Delete unused variable Date: Thu, 16 Aug 2012 12:22:14 +0200 Message-Id: <1345112535-10056-1-git-send-email-mbrugger@iseebcn.com> X-Mailer: git-send-email 1.7.9.5 X-Gm-Message-State: ALoCoQkGmy1siP1ywkFjCMj1O8vzBTnoq7VqGU47ctV3EB2tR/2eiMmnzkKa30uWt52IjSEvGWIs Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Signed-off-by: Matthias Brugger --- drivers/usb/musb/omap2430.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c index 5fdb9da..2d207c6 100644 --- a/drivers/usb/musb/omap2430.c +++ b/drivers/usb/musb/omap2430.c @@ -140,7 +140,6 @@ static void omap2430_musb_set_vbus(struct musb *musb, int is_on) struct usb_otg *otg = musb->xceiv->otg; u8 devctl; unsigned long timeout = jiffies + msecs_to_jiffies(1000); - int ret = 1; /* HDRC controls CPEN, but beware current surges during device * connect. They can trigger transient overcurrent conditions * that must be ignored. @@ -164,12 +163,11 @@ static void omap2430_musb_set_vbus(struct musb *musb, int is_on) if (time_after(jiffies, timeout)) { dev_err(musb->controller, "configured as A device timeout"); - ret = -EINVAL; break; } } - if (ret && otg->set_vbus) + if (otg->set_vbus) otg_set_vbus(otg, 1); } else { musb->is_active = 1;