From patchwork Wed Jun 21 17:49:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 111234 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp4544042vqr; Wed, 21 Jun 2023 10:59:43 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7cxC6AKhLABCosUnWvCw0AGlNRpU7K3bgOrhyNgAd/WAyxNpBlvLpzJHw9TQw1/kQxqVTC X-Received: by 2002:a05:6a20:54aa:b0:112:2843:b546 with SMTP id i42-20020a056a2054aa00b001122843b546mr21202165pzk.58.1687370383392; Wed, 21 Jun 2023 10:59:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687370383; cv=none; d=google.com; s=arc-20160816; b=gvCPR7aIxiSeEaI9ZeQni4nlwoJUtU2RPio4lIeCHQqgcVUAM9GwzLxEiXSVF+2R9z R0Au8TKXyt6/HxZnH7JUufO6TfcCcf5OmJdSrltenjIEVr7RfkE5RtdxtXYWvMnfRUX/ SkAHwAVN/Kb6Nc6OspQ44zi/ar5QNB5mw4VHIhm2ybAAR3c8Rj4QdO5u495rfPDI0kIw NrWAonjTpF17zlSOCQWuiOx4ViIfi7nA9Ryj527XuwRT2KuB0s+QYk666Z6z1wMbGDFy U4Tys6OPBFpGqKjl7fi/09aztJ81INzX8wxJxQt5TX6bLGG7fN1qgMHyo88mLO7CPJRY koEw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=0OEiqXZhWHH9FeDquqCGZsoRuVpkNMSYCcDKLH82Cgc=; b=x7pDYKBGphrEyR6ZLLSyvMVoN9+ocVUfAAO28rzyQUZsL0Rac2qDRK8JCYb8kwP1XV aQRL0oBS8Hlv1YOl04qZAbQ7B2wWBJA6m8kEUYUx0+qZXCLEiDWY3R9ca1XykwVPWBqp gTgeKDelZd/u0bzHlWVIBN3fGaNW30RY1+jhUGKYQFwFyizMwwc6OVKfvPumUfwffj1a dJ3boECLrIAro0t5DyN1+YV97qCtOXY4yQ50dPLr/AHcXplWp4O97sZIzBvEf2gyhuZ4 bNbi7xa1nGmW5zWOYcobtX+F9IISIP8laflrTFeC0EN04w5a8KIV0VqbjldEN9xrBwyS MoOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=VZZtPqFf; 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 y19-20020a63b513000000b005538a669b5fsi4458860pge.212.2023.06.21.10.59.28; Wed, 21 Jun 2023 10:59:43 -0700 (PDT) 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=VZZtPqFf; 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 S231629AbjFURuZ (ORCPT + 99 others); Wed, 21 Jun 2023 13:50:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231646AbjFURty (ORCPT ); Wed, 21 Jun 2023 13:49:54 -0400 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8C7A1BC3; Wed, 21 Jun 2023 10:49:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687369790; x=1718905790; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=MGD3tk/qL1WcZv7h1naypCRcwmKu0ejHb+zaSupSua4=; b=VZZtPqFf3pVdiiAF8njYL2CJbWrufuHyp65jOfg4x60PMPSXh/pdkhSF FKlGqDyXiZg7YypEXuNeQU60xjTO3zar32DSi3lsxYrKJgU1/hqHUNkA8 rM+mHyn4s3w4+79Z8c+tie2RO2DOQufUTnHtC3qRJdlkLoiUz1IBEGO8l B91OSM2ZTrCZIP5mA4UusHX+lUtnvEI1gg2DtOOITDhH8hO3jaHYtctEe Yovlizl9AtmSpU0i/AVoSasS9VucVxWVXxhGOD/geiUzG6G2ptB9J4Sq1 8rufD7F3GAL19MTBYnC9Lg2UhQGpZRFYGTMB5YJwOTFJN4Shi6T+9vwVk Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10748"; a="344988562" X-IronPort-AV: E=Sophos;i="6.00,261,1681196400"; d="scan'208";a="344988562" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jun 2023 10:49:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10748"; a="888775360" X-IronPort-AV: E=Sophos;i="6.00,261,1681196400"; d="scan'208";a="888775360" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga005.jf.intel.com with ESMTP; 21 Jun 2023 10:49:39 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 84880241; Wed, 21 Jun 2023 20:49:49 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , Bartosz Golaszewski , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Linus Walleij , Bartosz Golaszewski , Andy Shevchenko Subject: [PATCH v1 3/5] gpiolib: Do not assign error pointer to the GPIO IRQ chip domain Date: Wed, 21 Jun 2023 20:49:41 +0300 Message-Id: <20230621174943.30302-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230621174943.30302-1-andriy.shevchenko@linux.intel.com> References: <20230621174943.30302-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1769336087440906778?= X-GMAIL-MSGID: =?utf-8?q?1769336087440906778?= Check domain for being an error pointer before assigning it to the GPIO IRQ chip domain. Signed-off-by: Andy Shevchenko Reviewed-by: Linus Walleij --- drivers/gpio/gpiolib.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index fac1124d5016..0e40f9a44519 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1647,6 +1647,7 @@ static int gpiochip_add_irqchip(struct gpio_chip *gc, { struct fwnode_handle *fwnode = dev_fwnode(&gc->gpiodev->dev); struct irq_chip *irqchip = gc->irq.chip; + struct irq_domain *domain; unsigned int type; unsigned int i; @@ -1679,14 +1680,13 @@ static int gpiochip_add_irqchip(struct gpio_chip *gc, /* If a parent irqdomain is provided, let's build a hierarchy */ if (gpiochip_hierarchy_is_hierarchical(gc)) { - gc->irq.domain = gpiochip_hierarchy_create_domain(gc); - if (IS_ERR(gc->irq.domain)) - return PTR_ERR(gc->irq.domain); + domain = gpiochip_hierarchy_create_domain(gc); } else { - gc->irq.domain = gpiochip_simple_create_domain(gc); - if (IS_ERR(gc->irq.domain)) - return PTR_ERR(gc->irq.domain); + domain = gpiochip_simple_create_domain(gc); } + if (IS_ERR(domain)) + return PTR_ERR(domain); + gc->irq.domain = domain; if (gc->irq.parent_handler) { for (i = 0; i < gc->irq.num_parents; i++) {