From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6AE811D4154; Tue, 15 Oct 2024 11:51:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728993066; cv=none; b=lbPRlcjfK63Zyos72IcrRu6CSHR4zbZYEYl4A/WdhiW5+jHqzoROH9QY7gvoUX9/eZqn/oL6tapioRyBb/lz0t4N26UDN4oWHBl2ZXYHNNkhtaJvKDY5XuUYwqMKqf07JtA/vLeOs9NdcIUA4dCJXIoo2Zf9DL02B6Ogyvbs0OE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728993066; c=relaxed/simple; bh=9ql0D+kZdtFepsUvW66Jdzs7zaje6583kMQCtnFQYhw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Qt7/w8CgH4lxtnXW87VBdWIrUyAIPv+1j85IK6CTvO21q/IWdSfD6kCz0PBbHCwI2zj4XAPjMJo3/Tu/WkCisOLO5ojWR4nRjh8H9XxCFpWhmKHKUbhixarIRSOZWwHDUUZlWpl+feRmh8m4/WqVp70uNo/L8LKb/8yqYAG0hV0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=rxRxtsFV; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="rxRxtsFV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 812F3C4CEC6; Tue, 15 Oct 2024 11:51:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728993066; bh=9ql0D+kZdtFepsUvW66Jdzs7zaje6583kMQCtnFQYhw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rxRxtsFVceTPQYZIFz7uJfvzS5Izs46vBNuc3hW7B+sI1Ephn9x6esBr13iUbjAPD T2sP+XFddNPnxvXrfd6Ng3yL/ISC8a2vp1iEMwF5lwgjGWVEk+zOrFjcdOVChegIyD 7quLO2lAnYGmHiH0+nyZrzN6fT9IIjbDFNRPHcTk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Hans de Goede , Dmitry Torokhov , Ricardo Neri Subject: [PATCH 5.15 300/691] Input: goodix - use the new soc_intel_is_byt() helper Date: Tue, 15 Oct 2024 13:24:08 +0200 Message-ID: <20241015112452.250655422@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241015112440.309539031@linuxfoundation.org> References: <20241015112440.309539031@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Hans de Goede commit d176708ffc20332d1c730098d2b111e0b77ece82 upstream. Use the new soc_intel_is_byt() helper from linux/platform_data/x86/soc.h. Signed-off-by: Hans de Goede Link: https://lore.kernel.org/r/20220131143539.109142-5-hdegoede@redhat.com Signed-off-by: Dmitry Torokhov Signed-off-by: Ricardo Neri Signed-off-by: Greg Kroah-Hartman --- drivers/input/touchscreen/goodix.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) --- a/drivers/input/touchscreen/goodix.c +++ b/drivers/input/touchscreen/goodix.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -684,21 +685,6 @@ static int goodix_reset(struct goodix_ts } #ifdef ACPI_GPIO_SUPPORT -#include -#include - -static const struct x86_cpu_id baytrail_cpu_ids[] = { - { X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_SILVERMONT, X86_FEATURE_ANY, }, - {} -}; - -static inline bool is_byt(void) -{ - const struct x86_cpu_id *id = x86_match_cpu(baytrail_cpu_ids); - - return !!id; -} - static const struct acpi_gpio_params first_gpio = { 0, 0, false }; static const struct acpi_gpio_params second_gpio = { 1, 0, false }; @@ -782,7 +768,7 @@ static int goodix_add_acpi_gpio_mappings dev_info(dev, "Using ACPI INTI and INTO methods for IRQ pin access\n"); ts->irq_pin_access_method = IRQ_PIN_ACCESS_ACPI_METHOD; gpio_mapping = acpi_goodix_reset_only_gpios; - } else if (is_byt() && ts->gpio_count == 2 && ts->gpio_int_idx == -1) { + } else if (soc_intel_is_byt() && ts->gpio_count == 2 && ts->gpio_int_idx == -1) { dev_info(dev, "No ACPI GpioInt resource, assuming that the GPIO order is reset, int\n"); ts->irq_pin_access_method = IRQ_PIN_ACCESS_ACPI_GPIO; gpio_mapping = acpi_goodix_int_last_gpios;