Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp2352639pxb; Mon, 20 Sep 2021 19:49:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx/aUREI7H/NI98oUwOdUJxq+fzgUlhBZ+cA9ZBHrQetId6LVrVttgl/cFIePjbwxrQs/RZ X-Received: by 2002:a17:906:9747:: with SMTP id o7mr32391071ejy.486.1632192597943; Mon, 20 Sep 2021 19:49:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632192597; cv=none; d=google.com; s=arc-20160816; b=qZAevfacdQ9+Yhrp6g7Id1PxDZgk4l+Z/46BM7pz6iPdJhiM83DWo+y++pqK3PhZBE viC0KHg20j7+3W5SiiOhuu5ZkwrbtDfzzAlFRaHx4Uk08hRMZLQM4lJHJZl8amVD2GtA hohCkcZ9giTKJIrIZbpsSnr4qVqMrzoI8h1ufQkHEBojFoNMXbaPKmSVndYfECNLsiqL l2eCg9GqVH0/UZ1tJtonb8x2H02GJlXzRemhTJ4UTY/d5ywBhmqx7g69fUMiQp65p5ak F/lggidvcJtzPynMDOJdmVQCKZVK+UXQB0RAwbD7Fs8XN5xVRCgHbMLlddZv30zrh6pg ODKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=T3iWyK8UHP+dwIZG70fTl0wJf1EXFZz+uYOhYydb7dk=; b=QESm1Ps8337tHD2RHSo+L9AQYVEHbu2l0OYvg3qWDRoT1eSV4qFGnwwZa+XHbLVl7q /3SWwiYqFoyCyJ9sLGL1zkAKlBBIj6/Mkc1eDX8AkB9/602mDVqoJU381NBu9DjRLIpX XwUIYy1Y5llp+UvmQ//o1bqBoPmm4Z0+nQdUT7Ffr16GEeEHfPsCWnTFGEcB+R2+MbbC eYiTpimq1AV0xgSm7MeWJE2Dvc4GBaAf8hfQGgPRHmnWuE4AY6k/OEf7Yt6x3fSfC/+I 3+Y4HgVLYijG1JHCJkIZMWRcJRBPASciAYl5Wf2DXOlOVmlLM8zIdh+wrZPUerQ2LjbT MujQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=k0BYORud; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z2si18857503ejo.651.2021.09.20.19.49.34; Mon, 20 Sep 2021 19:49:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=k0BYORud; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1382004AbhITSjm (ORCPT + 99 others); Mon, 20 Sep 2021 14:39:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:53088 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1380609AbhITSee (ORCPT ); Mon, 20 Sep 2021 14:34:34 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 868DE6136A; Mon, 20 Sep 2021 17:28:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1632158927; bh=74MJXDGJ4K3AoGJVt5qkFWCkF8xXBBPjtzy3qMHCPWc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k0BYORuds4bFYBr7e0dAoipuqyP3nMgTdrsjxiv7W4N3uWVOgK4wNUctm/TdJAKwe GLB6PjoaprrKcnvI7TZaWvX4onGmcNxk8yVkTxhVvLkWGqb23zFdGYab2RBTqTH8AA Dus+N1o34omuER+a5Hk4iJrviaGQP/CEtQy0JpQ4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andy Shevchenko , Lee Jones , Sasha Levin Subject: [PATCH 5.10 119/122] mfd: lpc_sch: Partially revert "Add support for Intel Quark X1000" Date: Mon, 20 Sep 2021 18:44:51 +0200 Message-Id: <20210920163919.716089644@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210920163915.757887582@linuxfoundation.org> References: <20210920163915.757887582@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andy Shevchenko [ Upstream commit 922e8ce883e59b52786b2c11656d84dc58ef084a ] The IRQ support for SCH GPIO is not specific to the Intel Quark SoC. Moreover the IRQ routing is quite interesting there, so while it's needs a special support, the driver haven't it anyway yet. Due to above remove basically redundant code of IRQ support. This reverts commit ec689a8a8155ce8b966bd5d7737a3916f5e48be3. Signed-off-by: Andy Shevchenko Signed-off-by: Lee Jones Signed-off-by: Sasha Levin --- drivers/mfd/lpc_sch.c | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/drivers/mfd/lpc_sch.c b/drivers/mfd/lpc_sch.c index f27eb8dabc1c..428a526cbe86 100644 --- a/drivers/mfd/lpc_sch.c +++ b/drivers/mfd/lpc_sch.c @@ -26,9 +26,6 @@ #define GPIO_IO_SIZE 64 #define GPIO_IO_SIZE_CENTERTON 128 -/* Intel Quark X1000 GPIO IRQ Number */ -#define GPIO_IRQ_QUARK_X1000 9 - #define WDTBASE 0x84 #define WDT_IO_SIZE 64 @@ -43,30 +40,25 @@ struct lpc_sch_info { unsigned int io_size_smbus; unsigned int io_size_gpio; unsigned int io_size_wdt; - int irq_gpio; }; static struct lpc_sch_info sch_chipset_info[] = { [LPC_SCH] = { .io_size_smbus = SMBUS_IO_SIZE, .io_size_gpio = GPIO_IO_SIZE, - .irq_gpio = -1, }, [LPC_ITC] = { .io_size_smbus = SMBUS_IO_SIZE, .io_size_gpio = GPIO_IO_SIZE, .io_size_wdt = WDT_IO_SIZE, - .irq_gpio = -1, }, [LPC_CENTERTON] = { .io_size_smbus = SMBUS_IO_SIZE, .io_size_gpio = GPIO_IO_SIZE_CENTERTON, .io_size_wdt = WDT_IO_SIZE, - .irq_gpio = -1, }, [LPC_QUARK_X1000] = { .io_size_gpio = GPIO_IO_SIZE, - .irq_gpio = GPIO_IRQ_QUARK_X1000, .io_size_wdt = WDT_IO_SIZE, }, }; @@ -113,13 +105,13 @@ static int lpc_sch_get_io(struct pci_dev *pdev, int where, const char *name, } static int lpc_sch_populate_cell(struct pci_dev *pdev, int where, - const char *name, int size, int irq, - int id, struct mfd_cell *cell) + const char *name, int size, int id, + struct mfd_cell *cell) { struct resource *res; int ret; - res = devm_kcalloc(&pdev->dev, 2, sizeof(*res), GFP_KERNEL); + res = devm_kzalloc(&pdev->dev, sizeof(*res), GFP_KERNEL); if (!res) return -ENOMEM; @@ -135,18 +127,6 @@ static int lpc_sch_populate_cell(struct pci_dev *pdev, int where, cell->ignore_resource_conflicts = true; cell->id = id; - /* Check if we need to add an IRQ resource */ - if (irq < 0) - return 0; - - res++; - - res->start = irq; - res->end = irq; - res->flags = IORESOURCE_IRQ; - - cell->num_resources++; - return 0; } @@ -158,7 +138,7 @@ static int lpc_sch_probe(struct pci_dev *dev, const struct pci_device_id *id) int ret; ret = lpc_sch_populate_cell(dev, SMBASE, "isch_smbus", - info->io_size_smbus, -1, + info->io_size_smbus, id->device, &lpc_sch_cells[cells]); if (ret < 0) return ret; @@ -166,7 +146,7 @@ static int lpc_sch_probe(struct pci_dev *dev, const struct pci_device_id *id) cells++; ret = lpc_sch_populate_cell(dev, GPIOBASE, "sch_gpio", - info->io_size_gpio, info->irq_gpio, + info->io_size_gpio, id->device, &lpc_sch_cells[cells]); if (ret < 0) return ret; @@ -174,7 +154,7 @@ static int lpc_sch_probe(struct pci_dev *dev, const struct pci_device_id *id) cells++; ret = lpc_sch_populate_cell(dev, WDTBASE, "ie6xx_wdt", - info->io_size_wdt, -1, + info->io_size_wdt, id->device, &lpc_sch_cells[cells]); if (ret < 0) return ret; -- 2.30.2