Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp5099537ybi; Tue, 28 May 2019 07:32:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqyvdNNcSakIpB5rUN6YcvOq4oUkesz8aPpnbJsN3zEbqNFQViQanD/4vni0OY/yxdtNPw90 X-Received: by 2002:a17:90a:9503:: with SMTP id t3mr6394461pjo.47.1559053941038; Tue, 28 May 2019 07:32:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559053941; cv=none; d=google.com; s=arc-20160816; b=X9lP8/rL5mk4BJ5Vv6bR8g50cPj7jE5bfKfC9VbVjUPiPulZVzVaI2mHQXmbldKdOl plPEuYNl0na7ZHsEUN3toYauh4a9+CAt76CWpt3hqgF0LgQ/xRkl07Xfro48UB5c50ZO 4cyAGhbJvVwFWZGzH6j6OmqOCk0QAtjmE2EwhCngjpbmf8nrThxPgwLImIkftAaBe+M0 c71A7QILjnRHdLrX+kWbhsi2RW+dMoxn+hF9BpMs9q0Jvhzhnbe72MhGDqO4KRc0IH6L AhlS0+SMF7uGAlkZMz+bDc/P6FdlYa3b3YgxAH7i62lT1GXBW294eimsJ2TRF5rFYYyw 6nsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=tcDvy+ckfjlkZFNPH+8LVICNex54G4qyIKMz0UYN6zM=; b=HnbGCDaUrBxBu7xdgjc/KnpapE/WyVJ9hCtEp6hf02Yy1idscLtQf1IcJCdWLiFOSP laf+eTSL1X8JpCgwyD3BDf6SLMbkmHgO+EO+v31V51T18cZC684OiegmIyAn2NG20zgp 9IT6DA0fU8tluJor9ScziOnzpbopYH/Og8vUZdS6Zq4AOgYDhF9/GCkVMzlUi5Do4A4P OBoXRJQpAYjR7gvqDXkqw5Oe4voMNayBl7xgD4guGcBfCpncjnYdG7Z/rzgKuKT2rF3V 5CyTZba/V/EhVzV+nI4pcDdp1FAWcCU9IzwL8jCPAQyJ4l/thlpzvjO5zm5SrdpyNxvh +t7w== ARC-Authentication-Results: i=1; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=opensource.cirrus.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y12si21384404pgr.329.2019.05.28.07.32.05; Tue, 28 May 2019 07:32:21 -0700 (PDT) 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=opensource.cirrus.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727115AbfE1O3m (ORCPT + 99 others); Tue, 28 May 2019 10:29:42 -0400 Received: from mx0a-001ae601.pphosted.com ([67.231.149.25]:58696 "EHLO mx0b-001ae601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726693AbfE1O3b (ORCPT ); Tue, 28 May 2019 10:29:31 -0400 Received: from pps.filterd (m0077473.ppops.net [127.0.0.1]) by mx0a-001ae601.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x4SEOK0i014332; Tue, 28 May 2019 09:29:02 -0500 Authentication-Results: ppops.net; spf=none smtp.mailfrom=ckeepax@opensource.cirrus.com Received: from mail3.cirrus.com ([87.246.76.56]) by mx0a-001ae601.pphosted.com with ESMTP id 2sq340kgp1-1; Tue, 28 May 2019 09:29:01 -0500 Received: from EDIEX02.ad.cirrus.com (ediex02.ad.cirrus.com [198.61.84.81]) by mail3.cirrus.com (Postfix) with ESMTP id A0B1D61429A7; Tue, 28 May 2019 09:29:42 -0500 (CDT) Received: from EDIEX01.ad.cirrus.com (198.61.84.80) by EDIEX02.ad.cirrus.com (198.61.84.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1591.10; Tue, 28 May 2019 15:29:00 +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; Tue, 28 May 2019 15:29:00 +0100 Received: from algalon.ad.cirrus.com (algalon.ad.cirrus.com [198.90.251.122]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id 9579D44; Tue, 28 May 2019 15:29:00 +0100 (BST) From: Charles Keepax To: , CC: , , , , , , , Subject: [PATCH v3 5/6] i2c: core: Move ACPI gpio IRQ handling into i2c_acpi_get_irq Date: Tue, 28 May 2019 15:28:59 +0100 Message-ID: <20190528142900.24147-5-ckeepax@opensource.cirrus.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190528142900.24147-1-ckeepax@opensource.cirrus.com> References: <20190528142900.24147-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-1905280094 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It makes sense to contain all the ACPI IRQ handling in a single helper function. Signed-off-by: Charles Keepax --- No changes since v2. 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 62a938c17cbd2..42d53fe91c7ed 100644 --- a/drivers/i2c/i2c-core-acpi.c +++ b/drivers/i2c/i2c-core-acpi.c @@ -172,6 +172,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 b6b009bfe842b..684ea2665d994 100644 --- a/drivers/i2c/i2c-core-base.c +++ b/drivers/i2c/i2c-core-base.c @@ -336,9 +336,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