From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2C968C48BD3 for ; Wed, 26 Jun 2019 15:03:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 01FB320663 for ; Wed, 26 Jun 2019 15:03:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cirrus.com header.i=@cirrus.com header.b="jl5CQRGN" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728264AbfFZPDy (ORCPT ); Wed, 26 Jun 2019 11:03:54 -0400 Received: from mx0b-001ae601.pphosted.com ([67.231.152.168]:65070 "EHLO mx0b-001ae601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727641AbfFZPDx (ORCPT ); Wed, 26 Jun 2019 11:03:53 -0400 Received: from pps.filterd (m0077474.ppops.net [127.0.0.1]) by mx0b-001ae601.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x5QEx8JS031474; Wed, 26 Jun 2019 10:03:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=PODMain02222019; bh=lk0CZLxhaIfzfXjZ238/sT3/PzG6s4ccZFunpTS4VIw=; b=jl5CQRGNR2bOXFr8DVai8DxmFrawVYOvaQ+tDsyLuoF0fxClWmCAthPCrJIAeyMIhhQj CTLZrK4hcrndgD9rFCpm+eGlJ3v1qMWfUgIb4nLDg9e7mYyQKf/BdkcFKg9ho+8z+Bkg sWLpuK8M0brsd/xy7lzHyYTmw9TIOlUOpKsMbaVy9EvOjghe8yLyo4BKpC4EHNJioThm p9XYOYv2QHKZsm4qaSqy6i5ovR6XmSfYZYNeJUEfdNrea0/Gf+J6G9tHvusacaxHE2Jj ORnDwF/rj/rOC6djLH4r1uVOycRIUdW+jQbbuk/4EBUEMOPTDqqj6HnCWdCIWvP2cN8H Gw== Authentication-Results: ppops.net; spf=none smtp.mailfrom=ckeepax@opensource.cirrus.com Received: from mail1.cirrus.com (mail1.cirrus.com [141.131.3.20]) by mx0b-001ae601.pphosted.com with ESMTP id 2tc7gt8b7a-1; Wed, 26 Jun 2019 10:03:04 -0500 Received: from EDIEX01.ad.cirrus.com (unknown [198.61.84.80]) by mail1.cirrus.com (Postfix) with ESMTP id A6FC6611C8C1; Wed, 26 Jun 2019 10:03:03 -0500 (CDT) Received: from EDIEX01.ad.cirrus.com (198.61.84.80) by EDIEX01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1591.10; Wed, 26 Jun 2019 16:03:02 +0100 Received: from ediswmail.ad.cirrus.com (198.61.86.93) by EDIEX01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server id 15.1.1591.10 via Frontend Transport; Wed, 26 Jun 2019 16:03:02 +0100 Received: from algalon.ad.cirrus.com (algalon.ad.cirrus.com [198.90.251.122]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id 4C34C447; Wed, 26 Jun 2019 16:03:02 +0100 (BST) From: Charles Keepax To: , CC: , , , , , , , Subject: [PATCH v7 5/6] i2c: core: Move ACPI gpio IRQ handling into i2c_acpi_get_irq Date: Wed, 26 Jun 2019 16:03:01 +0100 Message-ID: <20190626150302.22703-6-ckeepax@opensource.cirrus.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190626150302.22703-1-ckeepax@opensource.cirrus.com> References: <20190626150302.22703-1-ckeepax@opensource.cirrus.com> MIME-Version: 1.0 Content-Type: text/plain X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=855 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1906260177 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org It makes sense to contain all the ACPI IRQ handling in a single helper function. Signed-off-by: Charles Keepax --- No change since v6. Thanks, Charles drivers/i2c/i2c-core-acpi.c | 3 +++ drivers/i2c/i2c-core-base.c | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c index e7559b3853062..99f22a93c059f 100644 --- a/drivers/i2c/i2c-core-acpi.c +++ b/drivers/i2c/i2c-core-acpi.c @@ -169,6 +169,9 @@ int i2c_acpi_get_irq(struct i2c_client *client) acpi_dev_free_resource_list(&resource_list); + if (irq == -ENOENT) + irq = acpi_dev_gpio_irq_get(adev, 0); + return irq; } diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c index c848b325969e9..1bf7d8748de14 100644 --- a/drivers/i2c/i2c-core-base.c +++ b/drivers/i2c/i2c-core-base.c @@ -328,9 +328,6 @@ static int i2c_device_probe(struct device *dev) irq = of_irq_get(dev->of_node, 0); } else if (ACPI_COMPANION(dev)) { irq = i2c_acpi_get_irq(client); - - if (irq == -ENOENT) - irq = acpi_dev_gpio_irq_get(ACPI_COMPANION(dev), 0); } if (irq == -EPROBE_DEFER) return irq; -- 2.11.0