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;
From:   Yangtao Li <frank.li@vivo.com>
To:     Kamal Dasu <kamal.dasu@broadcom.com>,
        Broadcom internal kernel review list 
        <bcm-kernel-feedback-list@broadcom.com>,
        Andi Shyti <andi.shyti@kernel.org>,
        Florian Fainelli <florian.fainelli@broadcom.com>
Cc:     Yangtao Li <frank.li@vivo.com>, linux-i2c@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH 03/11] i2c: brcmstb: Convert to devm_platform_ioremap_resource()
Date:   Wed,  5 Jul 2023 21:51:50 +0800
Message-Id: <20230705135159.33327-3-frank.li@vivo.com>
In-Reply-To: <20230705135159.33327-1-frank.li@vivo.com>
References: <20230705135159.33327-1-frank.li@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?BkHVNqjfRNKkpdeC6QRJXJ7ZWgJHdKZThQG3jgpHsPjGImh+Vky051T0X/Sx?=
 =?us-ascii?Q?auzI89jCM+jrlR+MPkWfGjzIjkb8oeeR4ts1ivKM5aykk9JYI5WINoN/eSfl?=
 =?us-ascii?Q?eSHdDoeFLCoiR6X+GoeGPbPcjKWSK8fkjFWPXgN7HI2CWpUnMIwoxl+b1nhH?=
 =?us-ascii?Q?YSGMx5x2o56fp8pDuHO3jaYmA305/IFDmYxjKHSNgiiYyiAW1mXBn7+GLHSM?=
 =?us-ascii?Q?BdxBYsgIMnRbqCgLckAQPD9MnJ1sPTVnyqD2hSo6LgyzEYOkYne5mGAnHE4T?=
 =?us-ascii?Q?kwEa58+ddsvceDBZhfABi8An0lSyS5nPgHfj20UsBpVpm5gV7Ya4gOGaOmBW?=
 =?us-ascii?Q?Spy9/3eZhxvfhDS7fCqhhk0UF9qMcmIop0V5cM565UMst+qcVVIJMk9x2bvy?=
 =?us-ascii?Q?oGK90OpqEtvZZpakve4esxZzm2Ev1oVVu+ZEPdHujP+L88ZjNOxkZsKS+M8S?=
 =?us-ascii?Q?IQfw2B3F+Y3/TeryQ9lXUJpXIw8rADi5A0FUd8zhumu0rK6lZ6E/0aydeogV?=
 =?us-ascii?Q?CluHk7lXMVSntoMpP9Y+lRQBlBT6bYCSa3LhF4mbKNERG0cjZCMWLCJr+nLR?=
 =?us-ascii?Q?eMCoC9WNceoGsoGpSTfxOwjuuWXkZ+f9VYWJetuxLPw5gjD8wlQ3J16CbTzX?=
 =?us-ascii?Q?0hd4w7KEAZFumntlWdAsvpdnm99aV0HTx5ah/LK1OPcWiwyZbES6XKkWoKor?=
 =?us-ascii?Q?Znr+btYyI0uygQZA6Jp7M9ViwspEaiU14+RXhXqGDAwt6ZYBSVDA3W7p9jUq?=
 =?us-ascii?Q?vrd4VoAIIIoXstKdzwzKgtqrn0jx9BwBxDTdYssLUA4b369wE7sxDDZyKwFR?=
 =?us-ascii?Q?sRVmSc/p5c/HU8gbUdrFzeAJkh52i3gKKj10Nj04wFZnEq7+mqiT6uBi5x+c?=
 =?us-ascii?Q?ZMDWULWMEu6/+9y6JAm6RqHUnlzVRBAti7kfPxCFyCt1WSpUrN7Pjxp0dr1P?=
 =?us-ascii?Q?EVLEOOj5WvqioaenKavTyL7YQvP5w6FGQ2BJ/v92rx0cUbuGXOossUr6qCTH?=
 =?us-ascii?Q?HMpws7r4+pUXZDSXHDxyUAcfGkr+D8PvhAaGAUGvyAgVFH0HiDEx2yWyPVWu?=
 =?us-ascii?Q?TPnJ0BwS1j2Ut4RHmSkDLhmy+953h7pAaX+2HXFKdsY9i/CTCIE9Rs/dHFoJ?=
 =?us-ascii?Q?Dnr6SfeZUwgwFxXg5WTTDJ83bPkRXm+eldY5ffa3x7XqsAN41IWGopU4AOPF?=
 =?us-ascii?Q?jt06hLAMSMLSB3cJUwZ+rOebBdEgbNIAPQe9VYR0EbPuVqlv8UJzxN6J2Ti0?=
 =?us-ascii?Q?MIFPd2L0s4FMG66nDgjNcUo3atPqEh46bjLxwsBbce+yCuBR5gcxrFW93OMD?=
 =?us-ascii?Q?tA9tiCHYiAFM41cS4cWQ+8S9n16dzxbZFoV5vduJl/R4niPayoPFaW7yzpzv?=
 =?us-ascii?Q?x/QIncC84404yF6vKjpIZZYgJH/KMi1JV1Iudx0vmp8q2HjW9QAurufzrYxb?=
 =?us-ascii?Q?pfGN5I98KOCJnuKAuqjGELELzl7eB4mlCyWTkLjDM0uvP72nsxBvuhOd50AW?=
 =?us-ascii?Q?Pr4wXbEbMcYWcs4d7vcXWBxe7jU2yfzHqgjeQdQSzic5vK8l0MrfOP3c9sFy?=
 =?us-ascii?Q?1JL2rKCGt3LnnvCiCZo4LSMp0BaFhEZJQRSgKQZY?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1c4eba2d-e317-4e3e-7f62-08db7d5f07e0
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2023 13:52:11.2073
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: MeNOJUHduFqIChA+otRU02FimWXDSqnYL+zGrwpKI1Tzxeo7WkK0myGE+JAhexLL4Hdw6EIBFn0CPssSmsEoBw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PSAPR06MB3991
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Use devm_platform_ioremap_resource() to simplify code.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 drivers/i2c/busses/i2c-brcmstb.c | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/drivers/i2c/busses/i2c-brcmstb.c b/drivers/i2c/busses/i2c-brcmstb.c
index cf92cbcb8c86..0d422487161a 100644
--- a/drivers/i2c/busses/i2c-brcmstb.c
+++ b/drivers/i2c/busses/i2c-brcmstb.c
@@ -594,11 +594,10 @@ static int bcm2711_release_bsc(struct brcmstb_i2c_dev *dev)
 
 static int brcmstb_i2c_probe(struct platform_device *pdev)
 {
-	int rc = 0;
 	struct brcmstb_i2c_dev *dev;
 	struct i2c_adapter *adap;
-	struct resource *iomem;
 	const char *int_name;
+	int rc;
 
 	/* Allocate memory for private data structure */
 	dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);
@@ -614,18 +613,15 @@ static int brcmstb_i2c_probe(struct platform_device *pdev)
 	init_completion(&dev->done);
 
 	/* Map hardware registers */
-	iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	dev->base = devm_ioremap_resource(dev->device, iomem);
-	if (IS_ERR(dev->base)) {
-		rc = -ENOMEM;
-		goto probe_errorout;
-	}
+	dev->base = devm_platform_ioremap_resource(pdev, 0);
+	if (IS_ERR(dev->base))
+		return PTR_ERR(dev->base);
 
 	if (of_device_is_compatible(dev->device->of_node,
 				    "brcm,bcm2711-hdmi-i2c")) {
 		rc = bcm2711_release_bsc(dev);
 		if (rc)
-			goto probe_errorout;
+			return rc;
 	}
 
 	rc = of_property_read_string(dev->device->of_node, "interrupt-names",
@@ -678,16 +674,13 @@ static int brcmstb_i2c_probe(struct platform_device *pdev)
 	adap->dev.of_node = pdev->dev.of_node;
 	rc = i2c_add_adapter(adap);
 	if (rc)
-		goto probe_errorout;
+		return rc;
 
 	dev_info(dev->device, "%s@%dhz registered in %s mode\n",
 		 int_name ? int_name : " ", dev->clk_freq_hz,
 		 (dev->irq >= 0) ? "interrupt" : "polling");
 
 	return 0;
-
-probe_errorout:
-	return rc;
 }
 
 static void brcmstb_i2c_remove(struct platform_device *pdev)
-- 
2.39.0