From patchwork Fri Feb 21 12:30:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 867553 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8014520896B for ; Fri, 21 Feb 2025 12:30:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740141015; cv=none; b=Qb/7kp+5iEn7Wvn4YC6R2vByPhcqjrHgMWQxUN09Q8cmGWLTso+VERJqdU9p8lLLUrSpRjrvB/di33HP3Lc33MBboKKan2RdNv+d1E0hWpNemil7U++wZzqdEjCD5L7KG8HkyPaTXf00p45VNXeW8+i4nRcAuCjTg+v+zVsaW8o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740141015; c=relaxed/simple; bh=zwIa9LnPM0/7Lq5mdjdr/aLybJgHHvLha6qt1CTUVyg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=QNVybqDgbD+hYW9EP/KAJ0K8q/CVmYtZycrgWZD5OO627xJ1og9VYYrCnTjR/xqQbcFBZ1rWYEaJI0Iw9W7PDQApurXvwc3ZoiF4nVNBHtlCEs/glrRGS89K/PU0j1JNte6m6UXH6/hcv/TDpHaYNrv5jQH85Y3WQlUXI1eJj9s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl; spf=none smtp.mailfrom=bgdev.pl; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b=jbRH15hZ; arc=none smtp.client-ip=209.85.221.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b="jbRH15hZ" Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-38f403edb4eso1155732f8f.3 for ; Fri, 21 Feb 2025 04:30:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1740141012; x=1740745812; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ZtqJEnmJyWeV1XPhylUERQv6caREg8pEVtLLf8kPmng=; b=jbRH15hZaZ+ZNRj4KGSAp9nu17Fh8EBLRTRgYa6oZe0esyeeKh0Fd9EWaiCvT6eKH+ fmFVQzEtMOv4GHy9YggRQost4uIvDTDlrnKcUkJusLM7Qid01vAaqB5gZY4n1J5+afbs 0uajak1HLAQXlwJcrN3jdmz0JunFcDaU9+jF1grBeiSS/9afSjfkbF7DVB++XyCZUG87 c2NTNIV0mS5RBaYWFx1no8nsTLygliR2U0UWel3X2lsEbBUKgkr94C5Tu8s9pVabQNzG lMFQpsWtIl8Rf74Z02Xw0UkQWeKLh+zX++Rta3MHChy+SEgFrBbkq8sflJnBCUmsW2g+ Zjew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740141012; x=1740745812; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ZtqJEnmJyWeV1XPhylUERQv6caREg8pEVtLLf8kPmng=; b=Fvsql3WrZnN8e8qYqPSwXIMnCIkHKgIC3Skxmd4QkUTJmqf3+BRu3wzTAGj29b/sre wSyZAr7qcUe0B/cJuhHGr0OUDI5QawWaYVws0rPdBIKcqYQOKAewXNss0MkPx8ES2DKh lH3OY0tYMJiaQ2u/AmbNxMD3LbSIQzctN5ePNtEpxUmVeQQwEYCdAU65f3rEayVt+kyY 0W6kmGsjnYS+JiWQAS3IWKWKC0iDvoUafRn/lH8Oq+uDqa18rNP1LAlhje+MO91rJSbG YMrGHr2BDM/yRRqBwLu5TcrKj0P9B6gQLCDMv5ZoPA+aNrYBqwuon2U7z27cZmd4Os+8 XphA== X-Gm-Message-State: AOJu0YxekJuyWCJDt1jbGph7zMQt3+1qDupCrnF9D8Rzh8mg3WlfikMu NXuSZQ/6rYIoiVpiIO5iEHLVMY6Rz/XOYNLKb8f9VAlXqLz74rPWIK36BBSZHXPhH6Xo3BrIFaH kJpM= X-Gm-Gg: ASbGnctliXejUO7ep7+QMAmXBH6isEUMrG5zD6f3+Tf9GUc+S3OTa4Bgw310K3qQ0DP 0AtPcwbVXu+9YP8/8RRjGnPF7ZcnbJvY4TalV21dapy32WFC8Lm40p64C/nuHi7EfzGvUCl01aG dZoNOCJcBAsHq9VGhKY92ClwO5+VGPn+ibuo3XIHVI0Tfk0z71zDqbBy1K7pKKZL1fpPJrzKYi5 0fOfe9PvZEQXnHfa4pWux4p+w7CUGLC2efrmtPcV8cQ1SvD03iyhSzg0FqAm5kO91W8ARvYBHXf HSLHUGspOAbOfN+DLerr9KSFOA== X-Google-Smtp-Source: AGHT+IFXw8oXcA07bB6uKu3QA6RMhy0mON/qnca36kKS/4X4msS4PkMCYOZuWLLD1PSvJnv87kbkJw== X-Received: by 2002:a5d:64a9:0:b0:38f:355b:13e9 with SMTP id ffacd0b85a97d-38f6e95af71mr3261259f8f.15.1740141011591; Fri, 21 Feb 2025 04:30:11 -0800 (PST) Received: from brgl-uxlite.home ([2a01:cb1d:dc:7e00:6cbc:77f7:6f0e:5a7c]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38f258ccd51sm23276274f8f.29.2025.02.21.04.30.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Feb 2025 04:30:10 -0800 (PST) From: Bartosz Golaszewski To: Linus Walleij Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Andy Shevchenko Subject: [PATCH] gpiolib: use the required minimum set of headers Date: Fri, 21 Feb 2025 13:30:01 +0100 Message-ID: <20250221123001.95887-1-brgl@bgdev.pl> X-Mailer: git-send-email 2.45.2 Precedence: bulk X-Mailing-List: linux-gpio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Bartosz Golaszewski Andy suggested we should keep a fine-grained scheme for includes and only pull in stuff required within individual ifdef sections. Let's revert commit dea69f2d1cc8 ("gpiolib: move all includes to the top of gpio/consumer.h") and make the headers situation even more fine-grained by only including the first level headers containing requireded symbols except for bug.h where checkpatch.pl warns against including asm/bug.h. Fixes: dea69f2d1cc8 ("gpiolib: move all includes to the top of gpio/consumer.h") Suggested-by: Andy Shevchenko Closes: https://lore.kernel.org/all/Z7XPcYtaA4COHDYj@smile.fi.intel.com/ Signed-off-by: Bartosz Golaszewski --- include/linux/gpio/consumer.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/include/linux/gpio/consumer.h b/include/linux/gpio/consumer.h index 0b2b56199c36..f53cd8a1eb1e 100644 --- a/include/linux/gpio/consumer.h +++ b/include/linux/gpio/consumer.h @@ -3,10 +3,7 @@ #define __LINUX_GPIO_CONSUMER_H #include -#include #include -#include -#include #include struct acpi_device; @@ -185,6 +182,9 @@ struct gpio_desc *devm_fwnode_gpiod_get_index(struct device *dev, #else /* CONFIG_GPIOLIB */ +#include +#include + static inline int gpiod_count(struct device *dev, const char *con_id) { return 0; @@ -549,6 +549,10 @@ struct gpio_desc *devm_fwnode_gpiod_get_index(struct device *dev, int gpiod_enable_hw_timestamp_ns(struct gpio_desc *desc, unsigned long flags); int gpiod_disable_hw_timestamp_ns(struct gpio_desc *desc, unsigned long flags); #else + +#include +#include + static inline int gpiod_enable_hw_timestamp_ns(struct gpio_desc *desc, unsigned long flags) { @@ -615,6 +619,8 @@ int devm_acpi_dev_add_driver_gpios(struct device *dev, #else /* CONFIG_GPIOLIB && CONFIG_ACPI */ +#include + static inline int acpi_dev_add_driver_gpios(struct acpi_device *adev, const struct acpi_gpio_mapping *gpios) { @@ -640,6 +646,8 @@ void gpiod_unexport(struct gpio_desc *desc); #else /* CONFIG_GPIOLIB && CONFIG_GPIO_SYSFS */ +#include + static inline int gpiod_export(struct gpio_desc *desc, bool direction_may_change) {