From patchwork Thu Aug 28 08:38:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 4799961 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EDFA09F38D for ; Thu, 28 Aug 2014 08:39:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1D261201C0 for ; Thu, 28 Aug 2014 08:39:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 684FD201E4 for ; Thu, 28 Aug 2014 08:39:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965490AbaH1Iju (ORCPT ); Thu, 28 Aug 2014 04:39:50 -0400 Received: from mail-lb0-f182.google.com ([209.85.217.182]:38795 "EHLO mail-lb0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936405AbaH1IjX (ORCPT ); Thu, 28 Aug 2014 04:39:23 -0400 Received: by mail-lb0-f182.google.com with SMTP id u10so498343lbd.13 for ; Thu, 28 Aug 2014 01:39:22 -0700 (PDT) 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:in-reply-to :references; bh=aUtcRnvq4xD7o/sZ8vA2gLj0ik4Pckwo3T48e71jIYE=; b=QcS6c2BEmHJtCK/7F5xX1xEytmTy+xdNQ3rjqTDqgNnuE5TJ8XnfEerlyH3ogUc+5h ahlkZ7yIAV/59oUGXVwaNZDBYLI5A4EeQI23vLCSK4eT2OnMNKZhd6YMrdB8T33Sf0q7 SUnuKSdfxdy4xNew/sp8V4wUdvu1dOMrpkhiECJF1H51YN2fra79FmFhSTCCThtBAq45 aYuWdTxZJN77NCPdimPkVJH/D8P7gSj4MTwuna+HjBgtY5789maJbCh0DEtVJPA0b8om 6sNGFKxnW7ovY02VTWVcZU+RXg6K+kW0CQPP1HkBquCmDVFErLZYlDjAaibhf7r61Ve/ 4qRg== X-Gm-Message-State: ALoCoQlvj7V9Mb/PdQLCGlofa2326ZILpq501/seiSBOb2s0pzXkDUrXGaiOgEinvo5ZVWgV71HN X-Received: by 10.112.4.70 with SMTP id i6mr2581124lbi.54.1409215162320; Thu, 28 Aug 2014 01:39:22 -0700 (PDT) Received: from uffe-Latitude-E6430s.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id t12sm4826676lbp.44.2014.08.28.01.39.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 Aug 2014 01:39:21 -0700 (PDT) From: Ulf Hansson To: "Rafael J. Wysocki" , Len Brown , Pavel Machek , Greg Kroah-Hartman , linux-pm@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org, Geert Uytterhoeven , Kevin Hilman , Alan Stern , Daniel Lezcano , Tomasz Figa , devicetree@vger.kernel.org, Linus Walleij , Simon Horman , Magnus Damm , Ben Dooks , Kukjin Kim , Stephen Boyd , Philipp Zabel , Mark Brown , Wolfram Sang , Chris Ball , Russell King , Ulf Hansson , linux-i2c@vger.kernel.org Subject: [PATCH v2 5/9] i2c: core: Convert to dev_pm_domain_attach|detach() Date: Thu, 28 Aug 2014 10:38:58 +0200 Message-Id: <1409215142-8218-6-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1409215142-8218-1-git-send-email-ulf.hansson@linaro.org> References: <1409215142-8218-1-git-send-email-ulf.hansson@linaro.org> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 Previously only the ACPI power domain was supported by the i2c bus. Let's convert to the common attach/detach functions for power domains, which currently means we are extending the support to include the generic power domain as well. Cc: linux-i2c@vger.kernel.org Signed-off-by: Ulf Hansson --- drivers/i2c/i2c-core.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 632057a..3cd8f11 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -279,10 +279,13 @@ static int i2c_device_probe(struct device *dev) if (status < 0) return status; - acpi_dev_pm_attach(&client->dev, true); - status = driver->probe(client, i2c_match_id(driver->id_table, client)); - if (status) - acpi_dev_pm_detach(&client->dev, true); + status = dev_pm_domain_attach(&client->dev, true); + if (status != -EPROBE_DEFER) { + status = driver->probe(client, i2c_match_id(driver->id_table, + client)); + if (status) + dev_pm_domain_detach(&client->dev, true); + } return status; } @@ -302,7 +305,7 @@ static int i2c_device_remove(struct device *dev) status = driver->remove(client); } - acpi_dev_pm_detach(&client->dev, true); + dev_pm_domain_detach(&client->dev, true); return status; }