From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C3479C00144 for ; Mon, 1 Aug 2022 11:42:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231378AbiHALmZ (ORCPT ); Mon, 1 Aug 2022 07:42:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231231AbiHALmL (ORCPT ); Mon, 1 Aug 2022 07:42:11 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40A0933418 for ; Mon, 1 Aug 2022 04:42:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1659354130; x=1690890130; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=g19KdUVvfCDHFtnbZ/2BEM25nadacgYHZujygauCaRs=; b=iYuYmcoR2db9ZrMeDdlhalC8BD3J1zgedVyZbV4yPTHTPb3JNT74lkmb QXu1kKfdBk1KvvLHq6vOc8vOVpKZXJMg6CBLW3BmmngP0szHlZ0J3YLW5 ILMGZFmPvqdbEPMTl0dS8CxXXYbvAOO/fSa/FkupTbVu0Xs7knuI2GIsN wW1gInsLbZe3E+em36nGlsO8cXfDKvyY03Ef/cPBrOeU8MKyEp8VxUOYb UkVyXbBzy/4+LUtosoc+UfRiruurfyisOQYmMUp6MxlSUT1PzVT3QoJ8I 3ceFi67uSsUftM6/2zPeCXinprWcQGyNCp0VWzvB9MIyQ7yGD/Y1PfNXc A==; X-IronPort-AV: E=McAfee;i="6400,9594,10425"; a="289136817" X-IronPort-AV: E=Sophos;i="5.93,206,1654585200"; d="scan'208";a="289136817" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Aug 2022 04:42:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,206,1654585200"; d="scan'208";a="704943423" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga002.fm.intel.com with ESMTP; 01 Aug 2022 04:42:08 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 078EE1D0; Mon, 1 Aug 2022 14:42:14 +0300 (EEST) From: Andy Shevchenko To: Lee Jones , Andy Shevchenko , Hans de Goede , linux-kernel@vger.kernel.org Cc: Lee Jones , Andy Shevchenko Subject: [PATCH v3 04/10] mfd: intel_soc_pmic_crc: Use devm_regmap_add_irq_chip() Date: Mon, 1 Aug 2022 14:42:05 +0300 Message-Id: <20220801114211.36267-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220801114211.36267-1-andriy.shevchenko@linux.intel.com> References: <20220801114211.36267-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use devm_regmap_add_irq_chip() to simplify the code. While at it, replace -1 magic parameter by PLATFORM_DEVID_NONE when calling mfd_add_devices(). Note, the mfd_add_devices() left in non-devm variant here due to potentially increased churn while wrapping pwm_remove_table(). Signed-off-by: Andy Shevchenko Tested-by: Hans de Goede Acked-for-MFD-by: Lee Jones --- v3: no changes v2: added tags and rebased on top of new patch 1 drivers/mfd/intel_soc_pmic_crc.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/drivers/mfd/intel_soc_pmic_crc.c b/drivers/mfd/intel_soc_pmic_crc.c index c4e6456976f5..64cdd435f8c5 100644 --- a/drivers/mfd/intel_soc_pmic_crc.c +++ b/drivers/mfd/intel_soc_pmic_crc.c @@ -189,10 +189,9 @@ static int intel_soc_pmic_i2c_probe(struct i2c_client *i2c, pmic->irq = i2c->irq; - ret = regmap_add_irq_chip(pmic->regmap, pmic->irq, - config->irq_flags | IRQF_ONESHOT, - 0, config->irq_chip, - &pmic->irq_chip_data); + ret = devm_regmap_add_irq_chip(dev, pmic->regmap, pmic->irq, + config->irq_flags | IRQF_ONESHOT, + 0, config->irq_chip, &pmic->irq_chip_data); if (ret) return ret; @@ -207,26 +206,17 @@ static int intel_soc_pmic_i2c_probe(struct i2c_client *i2c, irq_domain_update_bus_token(regmap_irq_get_domain(pmic->irq_chip_data), DOMAIN_BUS_NEXUS); - ret = mfd_add_devices(dev, -1, config->cell_dev, + ret = mfd_add_devices(dev, PLATFORM_DEVID_NONE, config->cell_dev, config->n_cell_devs, NULL, 0, regmap_irq_get_domain(pmic->irq_chip_data)); if (ret) - goto err_del_irq_chip; + pwm_remove_table(crc_pwm_lookup, ARRAY_SIZE(crc_pwm_lookup)); - return 0; - -err_del_irq_chip: - pwm_remove_table(crc_pwm_lookup, ARRAY_SIZE(crc_pwm_lookup)); - regmap_del_irq_chip(pmic->irq, pmic->irq_chip_data); return ret; } static int intel_soc_pmic_i2c_remove(struct i2c_client *i2c) { - struct intel_soc_pmic *pmic = dev_get_drvdata(&i2c->dev); - - regmap_del_irq_chip(pmic->irq, pmic->irq_chip_data); - /* remove crc-pwm lookup table */ pwm_remove_table(crc_pwm_lookup, ARRAY_SIZE(crc_pwm_lookup)); -- 2.35.1