From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2062816A956 for ; Wed, 17 Dec 2025 20:50:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766004604; cv=none; b=I4KnW5c9Dz1/JPYPJEzlVbMqXmC7DnlNyR7o5NPl/rd+q4eyuVTIDfErFB4OcgWpEWKIV7i/UyoeNgsZTHIyH3hQEI4tn7oqKT/goBYPEJVnwWpU0hzb7xwPdqbnlgVZC61wAN2KWHybhPFOz+uugilK6Wj8foCBR5YrwRYHrnU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766004604; c=relaxed/simple; bh=uZmeU6/lH+Oyx+HJkcBRoHj9KuSaQoSzqyS+vqTlh18=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=mZ4yNa9ofRRS4J15ntabGPfT4MUI1L6KsSjDzRexGHOCtphtoI+uPM+0bhLmBSHx9+nElPtP9vJ1bavXb/ncRxoRwEnRTuv8QgcqbRIfcdZiNRjbbVkQh6PXqp8BIiqRtEgTEZYrKOLxsKfEm7kcbhpT2Q95Te6UUBGzgGSuhns= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=kQAnPx7B; arc=none smtp.client-ip=209.85.216.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kQAnPx7B" Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-34c902f6845so4916861a91.2 for ; Wed, 17 Dec 2025 12:50:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766004602; x=1766609402; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=9Vqf2Irqa47r0MODYS/qJupfOYkoqLvIbxbr/hC0OZI=; b=kQAnPx7BigFTGUF9lbe3jYFGWCvd7IeQBoFWIs6m/bYzVtPLwnNxBfo0zxYPQfHmRE YeTyHLXvBmUqEOU61Ys2Utx2zXsB/F38zEi8bc9Pn+Ezb8RHiOKC1nXt+jCp+RDq5l7k dc5bK+3lFlT5NyWfSQ/dKekToBlFCsJaxRPzP6dbfh3OBgaiLJME0x/juG4121hKPN4S AOQS8B8kXn3rcD0pB0RBHFp7YyIRakHrToggdHv33mYG4qTY07VcTuTmsuE4kQUxVZbv 47bzw9HmQD1mw2i6k6jv8FIBrPYjzB5AkEq+ps1IAocy9eg0Cz3EdEVhjOOG1SuC5lmr NWew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766004602; x=1766609402; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=9Vqf2Irqa47r0MODYS/qJupfOYkoqLvIbxbr/hC0OZI=; b=HCTSJ89WHOsFGdfOtHwpgPmc77Ty/ev2UhSkXK6hRrsEaNpCeJj+6T4gKnIUsAAsIz tXE8iNFxLyBELh9g8gmzzJ51mhVQg9NqrRL5+F/RwEXdgGL/w4Y/D9U32Fda680/X7js zdWYNHNO/qItMhVEMcvBI8B2ke5hBPg7HBCf3fOWd6dhbZkc5OeNJY0GW5Ojzh3lCsjR aT9Qz/2yCc3tAjXcwlDxzGZEy8py8LzRS3FEm3X0cAtPoV/mVUsdBLxDzJwFeopN/sOJ 6qj0QWMAoSO59f0VlWMxLX0eOnejbiD4ny2QNCXor7vLxAaTnRPQEOtFIdgiSBHa9V7e szQw== X-Forwarded-Encrypted: i=1; AJvYcCVAuP8u8f+xhquKbN6qYT7gQllnCgWYB1Zm7Vmasgq5++PeZu5Bb2/C1liiZTNvUQmNoztd5ExsyFd8wN4=@vger.kernel.org X-Gm-Message-State: AOJu0YxRzMfm6N9X3gMkfQ2pflWHtEa0ToQMRpMsX5ORFLS3BFHFwrWg 2SAQhCtMPt0iG/hmKxRUR34MUIhsTBQPiTeO+1PtFNFhTJutVOeVVxfH X-Gm-Gg: AY/fxX4f3nBpfuHYhohruaRCQUDgYVZ+1mTcZpzFZKphLdYGqY4UEGbYFieZreoiRcu W0omLhJ5vRWCUQUtIZ/E1nZrw4Y5bbtw5fb/KCZ2VxL8ESYPdDgOO0jl+0XuHXWgUU4cnebTQ6Y HDNitGgUoJzJDEg69eCPmsP42fydo2mDe+XrGQhV8RIKY0ASfVhoDhSj4h1H3cS4imia7Gy0eSx b9W4QbFDx4H6Aytnli3c6yHeTVrZsA5HHm0XxXJ+/qRK5kBuPHMxvAzfq4wYjkGEc04/5r5MQmo Bsw5FNU+i4PAV7ZWjl7PUoJnmQNTabMA5NPKfA/kL4q4owgZxCeZo7loBZt+nOrjyO9r+KBIp0h heiWQrpA31ONBdYa2I5SY12zCTHtuX8oufOaBlaLKhU3kO3yrtJznTnUH/g== X-Google-Smtp-Source: AGHT+IGUYpYXdBuUIy2BGU5YINHw7vHPbEi5/3qNwcr/8j7+nQe807tukrqvmnkcXYlc9GyRKCPBGA== X-Received: by 2002:a17:90b:3f4f:b0:34a:4cc0:9e38 with SMTP id 98e67ed59e1d1-34abd71f4dfmr17296990a91.10.1766004602462; Wed, 17 Dec 2025 12:50:02 -0800 (PST) Received: from ryzen ([2601:644:8000:8e26::ea0]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-34e70dcc7bcsm434558a91.13.2025.12.17.12.50.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Dec 2025 12:50:01 -0800 (PST) From: Rosen Penev To: linux-i2c@vger.kernel.org Cc: Andi Shyti , Krzysztof Kozlowski , Alim Akhtar , linux-arm-kernel@lists.infradead.org (moderated list:ARM/SAMSUNG S3C, S5P AND EXYNOS ARM ARCHITECTURES), linux-samsung-soc@vger.kernel.org (open list:ARM/SAMSUNG S3C, S5P AND EXYNOS ARM ARCHITECTURES), linux-kernel@vger.kernel.org (open list) Subject: [PATCH] i2c: exynos5: simplify probe with devm Date: Wed, 17 Dec 2025 12:49:44 -0800 Message-ID: <20251217204944.10862-1-rosenp@gmail.com> X-Mailer: git-send-email 2.52.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Cleans up probe a little bit and separates preparation from enablement. Also use devm for i2c_add_adapter to get rid of the remove function. Fix return code for failed clk_get_prepared. It returns PTR_ERR. Signed-off-by: Rosen Penev --- drivers/i2c/busses/i2c-exynos5.c | 41 ++++++++------------------------ 1 file changed, 10 insertions(+), 31 deletions(-) diff --git a/drivers/i2c/busses/i2c-exynos5.c b/drivers/i2c/busses/i2c-exynos5.c index 9c1c5f3c09f6..fcc062910497 100644 --- a/drivers/i2c/busses/i2c-exynos5.c +++ b/drivers/i2c/busses/i2c-exynos5.c @@ -903,23 +903,20 @@ static int exynos5_i2c_probe(struct platform_device *pdev) i2c->adap.retries = 3; i2c->dev = &pdev->dev; - i2c->clk = devm_clk_get(&pdev->dev, "hsi2c"); - if (IS_ERR(i2c->clk)) { - dev_err(&pdev->dev, "cannot get clock\n"); - return -ENOENT; - } + i2c->clk = devm_clk_get_prepared(&pdev->dev, "hsi2c"); + if (IS_ERR(i2c->clk)) + return dev_err_probe(&pdev->dev, PTR_ERR(i2c->clk), "cannot get clock\n"); - i2c->pclk = devm_clk_get_optional(&pdev->dev, "hsi2c_pclk"); - if (IS_ERR(i2c->pclk)) { + i2c->pclk = devm_clk_get_optional_prepared(&pdev->dev, "hsi2c_pclk"); + if (IS_ERR(i2c->pclk)) return dev_err_probe(&pdev->dev, PTR_ERR(i2c->pclk), "cannot get pclk"); - } - ret = clk_prepare_enable(i2c->pclk); + ret = clk_enable(i2c->pclk); if (ret) return ret; - ret = clk_prepare_enable(i2c->clk); + ret = clk_enable(i2c->clk); if (ret) goto err_pclk; @@ -958,35 +955,18 @@ static int exynos5_i2c_probe(struct platform_device *pdev) exynos5_i2c_reset(i2c); - ret = i2c_add_adapter(&i2c->adap); - if (ret < 0) - goto err_clk; + ret = devm_i2c_add_adapter(&pdev->dev, &i2c->adap); platform_set_drvdata(pdev, i2c); - clk_disable(i2c->clk); - clk_disable(i2c->pclk); - - return 0; - err_clk: - clk_disable_unprepare(i2c->clk); + clk_disable(i2c->clk); err_pclk: - clk_disable_unprepare(i2c->pclk); + clk_disable(i2c->pclk); return ret; } -static void exynos5_i2c_remove(struct platform_device *pdev) -{ - struct exynos5_i2c *i2c = platform_get_drvdata(pdev); - - i2c_del_adapter(&i2c->adap); - - clk_unprepare(i2c->clk); - clk_unprepare(i2c->pclk); -} - static int exynos5_i2c_suspend_noirq(struct device *dev) { struct exynos5_i2c *i2c = dev_get_drvdata(dev); @@ -1036,7 +1016,6 @@ static const struct dev_pm_ops exynos5_i2c_dev_pm_ops = { static struct platform_driver exynos5_i2c_driver = { .probe = exynos5_i2c_probe, - .remove = exynos5_i2c_remove, .driver = { .name = "exynos5-hsi2c", .pm = pm_sleep_ptr(&exynos5_i2c_dev_pm_ops), -- 2.52.0