tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

i2c: amd8111: switch to devm_ functions

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à <filippo.muschera@gmail.com>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
Link: https://lore.kernel.org/r/20260202131304.8524-2-filippo.muschera@gmail.com

authored by

Filippo Muscherà and committed by
Andi Shyti 76b70625 f6dd64d6

+7 -19
+7 -19
drivers/i2c/busses/i2c-amd8111.c
··· 427 427 if (!(pci_resource_flags(dev, 0) & IORESOURCE_IO)) 428 428 return -ENODEV; 429 429 430 - smbus = kzalloc(sizeof(struct amd_smbus), GFP_KERNEL); 430 + smbus = devm_kzalloc(&dev->dev, sizeof(struct amd_smbus), GFP_KERNEL); 431 431 if (!smbus) 432 432 return -ENOMEM; 433 433 ··· 436 436 smbus->size = pci_resource_len(dev, 0); 437 437 438 438 error = acpi_check_resource_conflict(&dev->resource[0]); 439 - if (error) { 440 - error = -ENODEV; 441 - goto out_kfree; 442 - } 439 + if (error) 440 + return -ENODEV; 443 441 444 - if (!request_region(smbus->base, smbus->size, amd8111_driver.name)) { 445 - error = -EBUSY; 446 - goto out_kfree; 447 - } 442 + if (!devm_request_region(&dev->dev, smbus->base, smbus->size, amd8111_driver.name)) 443 + return -EBUSY; 448 444 449 445 smbus->adapter.owner = THIS_MODULE; 450 446 snprintf(smbus->adapter.name, sizeof(smbus->adapter.name), 451 - "SMBus2 AMD8111 adapter at %04x", smbus->base); 447 + "SMBus2 AMD8111 adapter at %04x", smbus->base); 452 448 smbus->adapter.class = I2C_CLASS_HWMON; 453 449 smbus->adapter.algo = &smbus_algorithm; 454 450 smbus->adapter.algo_data = smbus; ··· 455 459 pci_write_config_dword(smbus->dev, AMD_PCI_MISC, 0); 456 460 error = i2c_add_adapter(&smbus->adapter); 457 461 if (error) 458 - goto out_release_region; 462 + return error; 459 463 460 464 pci_set_drvdata(dev, smbus); 461 465 return 0; 462 - 463 - out_release_region: 464 - release_region(smbus->base, smbus->size); 465 - out_kfree: 466 - kfree(smbus); 467 - return error; 468 466 } 469 467 470 468 static void amd8111_remove(struct pci_dev *dev) ··· 466 476 struct amd_smbus *smbus = pci_get_drvdata(dev); 467 477 468 478 i2c_del_adapter(&smbus->adapter); 469 - release_region(smbus->base, smbus->size); 470 - kfree(smbus); 471 479 } 472 480 473 481 static struct pci_driver amd8111_driver = {