From patchwork Thu Apr 28 12:42:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 8969571 X-Patchwork-Delegate: rjw@sisk.pl Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4E44FBF29F for ; Thu, 28 Apr 2016 12:42:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 67380202E9 for ; Thu, 28 Apr 2016 12:42:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7C2CD202D1 for ; Thu, 28 Apr 2016 12:42:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751907AbcD1Mmo (ORCPT ); Thu, 28 Apr 2016 08:42:44 -0400 Received: from mail-wm0-f46.google.com ([74.125.82.46]:35282 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751513AbcD1Mmn (ORCPT ); Thu, 28 Apr 2016 08:42:43 -0400 Received: by mail-wm0-f46.google.com with SMTP id e201so75166772wme.0; Thu, 28 Apr 2016 05:42:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=OM4JUnhBU8vMc7IjWEF1oGxOYVcKxy+zxUxLE/1/IRQ=; b=gFpo8q3ij40ACom9qIs3t9n5GuUna9vjbbVq0ixBq+k9itIjymL4JM1iXsJCgBDf56 lXz5uxNJVX7aEAs2u41E50ZWUDktAb8OM7VNWAgSr1r2sJ1wSp5m2e3HFIk25bWVm8nB 8sDsVlLQJzEpDcTZut1/aeXYQBgw3vPPBCq9xPZAbL6uGopZ6J80v2rF1TnC890FkgeK ThUCHp7SyC/8JRzlKbn6JklDuVoKep92vZ86SPdp/aSlHo9OxdD1A6nwRTYgY+UP646v IggYaCPK2p5PrHGLQjKyyvvFXeEutf4xZs+PrXR6FRYbgNUGvS0J9zNqmK4hJGNJp7fd r2cQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=OM4JUnhBU8vMc7IjWEF1oGxOYVcKxy+zxUxLE/1/IRQ=; b=WZDHtAY0fOVPHvPjR65dCS1pwXIKRr/+EGsQAWP/dIWNmvKAxpvVVHh5bPjaykBruE sEr1ykhBQST/loUUvWzd77GLr904pcDb+2I6b4MUV0jPqFmIT60Ai8cPmzqIn8aQtpld gD+OXyJxoJV5YHR0RrkMLo37aWWDUNZg3qfWiE5tInK+U+JClnqg+IaQaglQ6DwZ1M4D PHflCevh+uSTE51jQGFqGK1Ii91o3qlPLPK2XczoGdT9qItJL7uvV5fTFeoB9aZtVDnc xmhzCWHgZizSFI0G2HWCoOuwcWHTxbf/q9odVIZSqHtzOHQh6fXM9RGAbJPMTSQMEaqP Lb0w== X-Gm-Message-State: AOPr4FVhmq48zdVuaPsP2Awp00lWbaDZabb0i2iOSbCrEVKbjC6hxodQr1JOE3ApoRCjqg== X-Received: by 10.194.114.228 with SMTP id jj4mr15366220wjb.121.1461847356805; Thu, 28 Apr 2016 05:42:36 -0700 (PDT) Received: from localhost (port-10751.pppoe.wtnet.de. [84.46.42.41]) by smtp.gmail.com with ESMTPSA id kq9sm9482298wjc.26.2016.04.28.05.42.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Apr 2016 05:42:35 -0700 (PDT) From: Thierry Reding To: "Rafael J . Wysocki" Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Todd Brandt Subject: [PATCH] PM / sleep: Remove unused `info' variable Date: Thu, 28 Apr 2016 14:42:34 +0200 Message-Id: <1461847354-11486-1-git-send-email-thierry.reding@gmail.com> X-Mailer: git-send-email 2.8.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 From: Thierry Reding Commit 32e8d689dc12 ("PM / sleep: trace_device_pm_callback coverage in dpm_prepare/complete") removed all users of this variable but forgot to remove the variable itself. Cc: Todd Brandt Signed-off-by: Thierry Reding --- drivers/base/power/main.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 6e7c3ccea24b..c81667d4bb60 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -1556,7 +1556,6 @@ int dpm_suspend(pm_message_t state) static int device_prepare(struct device *dev, pm_message_t state) { int (*callback)(struct device *) = NULL; - char *info = NULL; int ret = 0; if (dev->power.syscore) @@ -1579,24 +1578,17 @@ static int device_prepare(struct device *dev, pm_message_t state) goto unlock; } - if (dev->pm_domain) { - info = "preparing power domain "; + if (dev->pm_domain) callback = dev->pm_domain->ops.prepare; - } else if (dev->type && dev->type->pm) { - info = "preparing type "; + else if (dev->type && dev->type->pm) callback = dev->type->pm->prepare; - } else if (dev->class && dev->class->pm) { - info = "preparing class "; + else if (dev->class && dev->class->pm) callback = dev->class->pm->prepare; - } else if (dev->bus && dev->bus->pm) { - info = "preparing bus "; + else if (dev->bus && dev->bus->pm) callback = dev->bus->pm->prepare; - } - if (!callback && dev->driver && dev->driver->pm) { - info = "preparing driver "; + if (!callback && dev->driver && dev->driver->pm) callback = dev->driver->pm->prepare; - } if (callback) ret = callback(dev);