From patchwork Fri Nov 25 18:11:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 26116 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp4211782wrr; Fri, 25 Nov 2022 10:22:38 -0800 (PST) X-Google-Smtp-Source: AA0mqf5j9wEG9FqtbD/WI6OsqfB0+7hcWmgBMiqqPcnPnYf53sBCDWcCii+1fyvlTdBcy996APID X-Received: by 2002:a17:90b:154e:b0:216:bd62:8e69 with SMTP id ig14-20020a17090b154e00b00216bd628e69mr46313543pjb.205.1669400557597; Fri, 25 Nov 2022 10:22:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669400557; cv=none; d=google.com; s=arc-20160816; b=y4ZoeEBJ7UFVVylQV3D8MXm8rA77tZnGLQWUidJwvYJaYUMKDC0JPH7DDcxmPmXBBY jxSQ97ig+iBSyNRApsJ/JoiTjJjUm60knirGHdh6gZJzHxfXFc1qHfrY3p+kuuGGKXzK 9r4DinfBSWu/aiCfx73e4bKVvETwGiGzt1kUIKVz9oA3yKHEqbztUSu63JfmZMW+T/jp 6NV4tJtDUQiERt88LPocGy/vZVl0xvxHaVSNsS1mbUSIGU7fyUeuMI6aY75nt/qI1bxq bB3vZLQOucm4GPUnK7pOTmPZ0/ER0CBci5+/FZ4s6cMpWRCQXO/dR4VKy3IAm0wN6TkG bgCg== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=bufdeu7O6f4j5OcMYl8av117pFzQIWznVNYU0Z5xyRk=; b=DVC8mje91kB7wHoQbHx4H0Rj7qGVZ0FTExABMhyb4RIdkGA975Moq9RaSlDh0mIjMo ud8ajLh2oa9Y3CQbMDkMDnH9i8GC8Ss/bXS9gtPHlem2PZkNzbAEB4mbGOZtfOJKjKVr l4Zj+bmHLf6RsZGFc4pT5fXFLnk8o5FPN3rBgA1Q4ToZSo7xcCNXiivk2CytBVGpGAog d756bDKAam9Rn7bC8hrrHGzLz3G2ast6MjA+GBHANWFcyARI8UIS6HptrdZ3W/hfzAhO 2rlOaRo80eA7+fEAsQw7ImEAkmUmXLezZeQYk6pvOtF7rvJaSsDM1dhClDRHb2GZK50h IoOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=dQ9FRFth; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bt21-20020a17090af01500b00213022ff9a8si7508935pjb.168.2022.11.25.10.22.17; Fri, 25 Nov 2022 10:22:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=dQ9FRFth; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229848AbiKYSLj (ORCPT + 99 others); Fri, 25 Nov 2022 13:11:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59152 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229491AbiKYSLi (ORCPT ); Fri, 25 Nov 2022 13:11:38 -0500 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4BFFE31DD6; Fri, 25 Nov 2022 10:11:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669399897; x=1700935897; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=gC1O2EpjM7tKecxBRtq3dHXj7LrD8+1bUGKq3WhcNRs=; b=dQ9FRFthbgcahnZiDc3I0fY+bFVaqUi5g3lt+ihLVp9YdRtx+nTuzkUP TephxamY0Bax4kHlHpMx6gIbw6MHsfM/Cd/vyeCK/fCEkbKPama7S9kAv jL91oaCs4ziwy/nEJOQPAHf294boOK/g4cDrDnrXbmwJfjrOvX55F1aff u4Z9wdx0VDDjAseL7bnNFlOu589aNw1q4a7ffNediR6OHZY+bjTEr0Eg/ Yo3Tfuu7Uh1VSzYEBLRf3nXrtczNbSgYNEGgrBEcbe8LG1sDt+lVxeyqM L3wD0kDrW5fb8mJzhX78SQOKPTUnUYi3ZFVGNAiHAjiV/l6N6ZF8pTxHJ Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10542"; a="341426383" X-IronPort-AV: E=Sophos;i="5.96,194,1665471600"; d="scan'208";a="341426383" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Nov 2022 10:11:36 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10542"; a="642762582" X-IronPort-AV: E=Sophos;i="5.96,194,1665471600"; d="scan'208";a="642762582" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga002.jf.intel.com with ESMTP; 25 Nov 2022 10:11:34 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 00A77128; Fri, 25 Nov 2022 20:12:00 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , Bartosz Golaszewski , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Linus Walleij Subject: [PATCH v1 1/2] gpiolib: Provide to_gpio_device() helper Date: Fri, 25 Nov 2022 20:11:57 +0200 Message-Id: <20221125181158.67265-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750493359378164466?= X-GMAIL-MSGID: =?utf-8?q?1750493359378164466?= Provide to_gpio_device() helper which can be utilized in the existing and future code. While at it, make sure it becomes no-op at compilation time. Signed-off-by: Andy Shevchenko --- drivers/gpio/gpiolib.c | 2 +- drivers/gpio/gpiolib.h | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 119c9c3a2a50..9b935288db9d 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -547,7 +547,7 @@ EXPORT_SYMBOL_GPL(gpiochip_line_is_valid); static void gpiodevice_release(struct device *dev) { - struct gpio_device *gdev = container_of(dev, struct gpio_device, dev); + struct gpio_device *gdev = to_gpio_device(dev); unsigned long flags; spin_lock_irqsave(&gpio_lock, flags); diff --git a/drivers/gpio/gpiolib.h b/drivers/gpio/gpiolib.h index d900ecdbac46..027674025561 100644 --- a/drivers/gpio/gpiolib.h +++ b/drivers/gpio/gpiolib.h @@ -20,9 +20,9 @@ /** * struct gpio_device - internal state container for GPIO devices - * @id: numerical ID number for the GPIO chip * @dev: the GPIO device struct * @chrdev: character device for the GPIO device + * @id: numerical ID number for the GPIO chip * @mockdev: class device used by the deprecated sysfs interface (may be * NULL) * @owner: helps prevent removal of modules exporting active GPIOs @@ -47,9 +47,9 @@ * userspace. */ struct gpio_device { - int id; struct device dev; struct cdev chrdev; + int id; struct device *mockdev; struct module *owner; struct gpio_chip *chip; @@ -72,6 +72,8 @@ struct gpio_device { #endif }; +#define to_gpio_device(_dev_) container_of(_dev_, struct gpio_device, dev) + /* gpio suffixes used for ACPI and device tree lookup */ static __maybe_unused const char * const gpio_suffixes[] = { "gpios", "gpio" };