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 v2 03/11] i2c: brcmstb: Convert to devm_platform_ioremap_resource()
Date:   Mon, 10 Jul 2023 14:33:42 +0800
Message-Id: <20230710063351.17490-3-frank.li@vivo.com>
In-Reply-To: <20230710063351.17490-1-frank.li@vivo.com>
References: <20230710063351.17490-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?GGA00dV2vQxbnD5byvtFMw7nxmICjKvNSV74NLc/Ieg5rsEE7obUNSwegBtZ?=
 =?us-ascii?Q?D97CG2ymSVBfKN964DvFhjfUHfcBh6Uuu6lRXol8i6rsCqobqILNb/FjLYT6?=
 =?us-ascii?Q?u2c6MzKjiTkYgSteIQEcWpKygOEgW/bMoM8V/+x1cFc3CRA2KMrqT5OxSNC1?=
 =?us-ascii?Q?L+bsbki7EDVkViqpSS0IWzW4Qj2YGAtHcCOzAVN66jflGRFnHfBfvOgDNxAa?=
 =?us-ascii?Q?+MZRx7SzyRiGX9bdzJEoV3dDEQau+e/eIm9UoUSwQtDrSwngme7Njb7fpj8j?=
 =?us-ascii?Q?RWsC6SSrCganSXkturAaddro3VlDMB47m/ZyneiO7b7oNbC0a30jMBbLAc/Q?=
 =?us-ascii?Q?wZj3Tr4P2p3SeJg02x//XMgowCsAQBtxrH/rRK1r61kKF4/0j+WqJqpp0cz/?=
 =?us-ascii?Q?vSICmzTiy+zZTyjN3aFFsZ5lhJgN6UYm0HR2goGaoh6IZvazGF9/nE1zjVzQ?=
 =?us-ascii?Q?yuS4G1tP5Elohj95XQUQ1rvMrukvUNagJf05OboFpO9mRUEy8AM8MfLY6Q32?=
 =?us-ascii?Q?uwC096jytHAtbgcELiPmWeSONESP48PE+z1SbXCG00a3ZIpNon6xpKTjcKKn?=
 =?us-ascii?Q?17Kh5uhghrQVfeZtTQm/SL4hvA3z0kok2VlAkIeeOV4DOVYVIXF85/ZatFLt?=
 =?us-ascii?Q?O26WegoWnwKpJqnMmeatQvJ39awx6Siqu8NaoE+CAL0hZ6pOTrQaodpZmYtl?=
 =?us-ascii?Q?7q86lMHcrLOicgdV2dsTsaSgVG9znMSfjJ6akgbbHbJUaJtVLSKKZSGLiAZo?=
 =?us-ascii?Q?8dpIVLCkrIP/mGzVrNVrqUQL6UuPnOY9iBKREX4polAJWRB+HYusDUbXQ74/?=
 =?us-ascii?Q?gt12x+tDy5XNT99EGb/wSupXauUny7mvv+TFEw4nDhiBDDqkzM/odxTbHm3z?=
 =?us-ascii?Q?ODMLAuYDOpuE/miVq5/k5zwlcKRDzFSXGH0VK45nFAzne5QIy2GfiRylIN9o?=
 =?us-ascii?Q?Pe39xrA1DD8G89b0q3eXrBmkd/SsODYJ+NFNk99Q3RLl+psFMbzFhpgWgmkY?=
 =?us-ascii?Q?A5RjuFJpxYEzzy8JG/llIj6EM9SsOSRiox5ZF5cE0Xrdl5gov6vO7nVTS/gV?=
 =?us-ascii?Q?aQGal6YrjsZJj3etdSAf599dbRRk3TDTEjE7jsZWXRt1NS46wpTT8LOt0thG?=
 =?us-ascii?Q?iWc9IzOD0o2S0s5Q38IbW235Cdf6kahz1qrEHC4tRySPItXCVCJgBdXBStLN?=
 =?us-ascii?Q?t7g2hMQIZ0jFk+7qNRoqVpxYSVTYPoC153oEx3gR+FPZwQQbniGw3APwnNyi?=
 =?us-ascii?Q?4Vt8DF+APiuXiX/kCvKfCeJzc4K78sZYkYYrQ2aOvoAzzaf5NusSo+ECRxl/?=
 =?us-ascii?Q?7Ay73yc3qD8n2jmWZJ2hBpS22KUdzwx2jNzi6j68rE4ZZO9yl+soykDEUQ1w?=
 =?us-ascii?Q?e6ZG1XAFBz6IYvfRAL2OYmiGLuD9bOtZV3WNUsFgKinn0Ws1GFwb7EicCina?=
 =?us-ascii?Q?gbDyYU8UgSN95AF1i3nIAdxaIyFNirqQEn/iW1eVqQVnbxFGjMS0Hv23k+cp?=
 =?us-ascii?Q?nVG/Q+tIGSos30JhBnkQj0WlDLXOv8vwl8p16QlePeKd8wYYMwP4hDwQ0VI+?=
 =?us-ascii?Q?qY2sQUe2UlzgJ3CXpy87WQgDhYVLBbfUtvJNZYmY?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: cb8ae2c8-c0b0-4cf8-d952-08db810faa06
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2023 06:34:08.2731
 (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: mTopqEJugnMaeQFNLrREGTERWrPjFhCJHoyPyqYfQFQHR+sZ56Q6oW97cwUpZMeJw45xDPOoUMouo2TZOlYBkg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB5631
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_BLOCKED,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        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