From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) (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 BDCAC10F1 for ; Mon, 2 Feb 2026 13:14:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770038054; cv=none; b=Z+lugHms8y7Pq4msicmKo19Fi359PEPPAMnlkNxiY6/L55E+Ln+brlLcIkD4QZaycx5MLdmj4UEiRpGfJKKmh11NmC/jkHgoSLD9rbyzwe2brHV7ex2IN4HTFIu1KTLHp84KhHkWndWtUjIXv00snnTSY4uH6TmVyG/dHzgpkjA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770038054; c=relaxed/simple; bh=hXbrIL/+RlZ4QrzMitIlyjKmIQanPf6iyPGIcFMUZrk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=H7kjB0jKwUy/hJB80T77RD/FX47WGFldqHh7Jv4tJVrEyY97oC6C/5GUBrCXF6A1lQfMkzDG8/+Aq1eRJQKyqmZaW1XWvQGzdEG6Nw69FFjDA/HWdDkNWY8xGjl9G8l8iS7S6t8id+trX+gVpCpgNFCqXrCBItJ4577UWWILd8g= 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=DyUCxvC9; arc=none smtp.client-ip=209.85.221.45 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="DyUCxvC9" Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-42fbc305882so2756083f8f.0 for ; Mon, 02 Feb 2026 05:14:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770038051; x=1770642851; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2TLTptQVGzGqVMmcaxe2rInRq4le7Tc2RkR47pL2Pvw=; b=DyUCxvC9ICxWXD3w79i8NBIjpLxxVxqCbW/A0lMAhkEo1m7TvoOj6tDZ5f1VGfGBPr jPWtKCY6SuY0ruXaS5AeLBidRZ4SIukoMUb2miuvxHCR70oDD1SUrVeLMcxr0tvLXmip QEKZORJzgE2Je7hkE1HZY6GEk2pOuN2zpsQBADl8Pw1svk2jKn3nEGbTctTBWXX4qUbp OEbnAV4V45/UfVUbem6sTCvrmfw9bt5kmUWUgj1XqMQAizRy01XimrKyVAp0tbZxgEAR XkWZ6NBUPJ9fxD2panbK1QAJkRyma3eXofW99ocKEO0F+9HzhV0dJpUSK6tvj7yCTiCe Km3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770038051; x=1770642851; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=2TLTptQVGzGqVMmcaxe2rInRq4le7Tc2RkR47pL2Pvw=; b=Kv0zUqiSd92v8XIGFv/z/Ugn7szk7dROM+YL2N56bFUkJbzhfrKGVqCnJ/E28o2OgO IUPUvKN0MRo4yjKP3evi2vCMQ3i4eC5mLi5iQKc+pg0uGwcL+ixc7bqG9WgEvHYARMlB C675oHyGbdrU+cs5Hvi5BGcb7gtIaTLtXRZPW5RPb0pwymdD6yyCENzoWuJaCm5bC41U 7Ht5dISLggD2Z5bQBEQ5s4Wbtac7VdByLxB4HTNVBJIGzEXj/N1/Iam/2xpDgpknmoBA AQN4MrzgSxBnCA9odA/x01TfTWF+uKw1wBMj27GACEVFg3bQ7QicsB5DDh3nJdEYA84g gIRA== X-Forwarded-Encrypted: i=1; AJvYcCVbJtLG4spQ4jRa74QH9JRzbF320xk3DnrTeGexVct1gGjx2Bov5i1jThWLiYIt5E9P2thkSEIiw00MZ3Y=@vger.kernel.org X-Gm-Message-State: AOJu0Yxl6gxlU7kYiw7ZLkGD81ogtr4yzEj7DtmZRtv9Atbv+WPLdrsD Eq61VGBsb7sTWg4vC7FUUvUIeXS70luNC5Ea1hpIkL8GkL9gm0OMImCG X-Gm-Gg: AZuq6aJ8Z9U0vqtec0CqPCTnVP6alzU/omDX0k7s6PeW5hwGq0E8xqOXTV9PERPcGHl 9cHDew4Z8PTLqbYnfKZfeYlFEin60BgHNA+lodpBmXxyYxCxjGPth8FQztol1b80mJkR/QrygHQ RKFP0ndReT9PCIPU2WYwEf7Xtfsk1QBQSRg1e/fmqZHnlDRgBOygd53lROMsvquxLbw2nWTrz2v 1FfXg2+9F072SlYiE2k2WlxX05YN7YpQXdaSPekTW/aoBTuqzCn7zzXa0Ntqj8RM+VOo1KKnHKw lGPAMRnr6XZREU1JyzUa5h2hGMshYB5QFtElb/ub7wBd9Y5W8lhKbsdUHEmLJBSbbQ0wnMkCQm8 r36Nng58qtkhbYgSu3k013RfcJaL1Yem+aJdJ+En4LRS/SJWc9bZcIvMDDvcsF1QubrzEcl9V+J t97tVSFZTT5/siYshiqGD9KJ4= X-Received: by 2002:a5d:5d84:0:b0:435:9a4a:9b79 with SMTP id ffacd0b85a97d-435f3aaa9ebmr17085567f8f.31.1770038051060; Mon, 02 Feb 2026 05:14:11 -0800 (PST) Received: from fedora ([179.43.189.94]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-435e10ee04csm44242415f8f.12.2026.02.02.05.14.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Feb 2026 05:14:10 -0800 (PST) From: =?UTF-8?q?Filippo=20Muscher=C3=A0?= To: jdelvare@suse.com, andi.shyti@kernel.org Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Filippo=20Muscher=C3=A0?= Subject: [PATCH 2/2] i2c: amd8111: switch to devm_ functions Date: Mon, 2 Feb 2026 14:13:04 +0100 Message-ID: <20260202131304.8524-2-filippo.muschera@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260202131304.8524-1-filippo.muschera@gmail.com> References: <20260202131304.8524-1-filippo.muschera@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use devm_kzalloc() to manage the memory allocation of the smbus structure and devm_request_region() to manage the I/O port region. This simplifies the error handling paths in the probe function by removing manual cleanup and allows for the removal of the explicit cleanup in the remove function. Signed-off-by: Filippo Muscherà --- drivers/i2c/busses/i2c-amd8111.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/drivers/i2c/busses/i2c-amd8111.c b/drivers/i2c/busses/i2c-amd8111.c index 51e3660e51c6..dd9ac4bb6704 100644 --- a/drivers/i2c/busses/i2c-amd8111.c +++ b/drivers/i2c/busses/i2c-amd8111.c @@ -427,7 +427,7 @@ static int amd8111_probe(struct pci_dev *dev, const struct pci_device_id *id) if (!(pci_resource_flags(dev, 0) & IORESOURCE_IO)) return -ENODEV; - smbus = kzalloc(sizeof(struct amd_smbus), GFP_KERNEL); + smbus = devm_kzalloc(&dev->dev, sizeof(struct amd_smbus), GFP_KERNEL); if (!smbus) return -ENOMEM; @@ -436,19 +436,15 @@ static int amd8111_probe(struct pci_dev *dev, const struct pci_device_id *id) smbus->size = pci_resource_len(dev, 0); error = acpi_check_resource_conflict(&dev->resource[0]); - if (error) { - error = -ENODEV; - goto out_kfree; - } + if (error) + return -ENODEV; - if (!request_region(smbus->base, smbus->size, amd8111_driver.name)) { - error = -EBUSY; - goto out_kfree; - } + if (!devm_request_region(&dev->dev, smbus->base, smbus->size, amd8111_driver.name)) + return -EBUSY; smbus->adapter.owner = THIS_MODULE; snprintf(smbus->adapter.name, sizeof(smbus->adapter.name), - "SMBus2 AMD8111 adapter at %04x", smbus->base); + "SMBus2 AMD8111 adapter at %04x", smbus->base); smbus->adapter.class = I2C_CLASS_HWMON; smbus->adapter.algo = &smbus_algorithm; smbus->adapter.algo_data = smbus; @@ -459,16 +455,10 @@ static int amd8111_probe(struct pci_dev *dev, const struct pci_device_id *id) pci_write_config_dword(smbus->dev, AMD_PCI_MISC, 0); error = i2c_add_adapter(&smbus->adapter); if (error) - goto out_release_region; + return error; pci_set_drvdata(dev, smbus); return 0; - - out_release_region: - release_region(smbus->base, smbus->size); - out_kfree: - kfree(smbus); - return error; } static void amd8111_remove(struct pci_dev *dev) @@ -476,8 +466,6 @@ static void amd8111_remove(struct pci_dev *dev) struct amd_smbus *smbus = pci_get_drvdata(dev); i2c_del_adapter(&smbus->adapter); - release_region(smbus->base, smbus->size); - kfree(smbus); } static struct pci_driver amd8111_driver = { -- 2.52.0