Skip to content

Commit 3f908e9

Browse files
jcfaraccojcfaracco
committed
Merge: RHEL-10.1 IPMI update to v6.14
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/642 ``` JIRA: https://issues.redhat.com/browse/RHEL-82110 Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=67136576 Omitted-fix: ebf7f7d Revert "ptp: Switch back to struct platform_driver::remove()" Does not affect drivers/char/ipmi, so is outside the scope of this backport. The following ... 1751f87 2025-01-28 2025-01-28 treewide: const qualify ctl_tables where applicable ...was ommitted because... 7abc9b5 2024-10-09 2024-08-05 sysctl: allow registration of const struct ctl_table ...has not been backported, yet. Signed-off-by: Tony Camuso <tcamuso@redhat.com> Approved-by: Steve Best <sbest@redhat.com> Approved-by: David Arcari <darcari@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Julio Faracco <jfaracco@redhat.com>
2 parents 88894d4 + 34c4b35 commit 3f908e9

File tree

14 files changed

+20
-26
lines changed

14 files changed

+20
-26
lines changed

‎drivers/char/ipmi/bt-bmc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ static struct platform_driver bt_bmc_driver = {
481481
.of_match_table = bt_bmc_match,
482482
},
483483
.probe = bt_bmc_probe,
484-
.remove_new = bt_bmc_remove,
484+
.remove = bt_bmc_remove,
485485
};
486486

487487
module_platform_driver(bt_bmc_driver);

‎drivers/char/ipmi/ipmb_dev_int.c‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,9 @@ static int ipmb_probe(struct i2c_client *client)
321321
ipmb_dev->miscdev.name = devm_kasprintf(&client->dev, GFP_KERNEL,
322322
"%s%d", "ipmb-",
323323
client->adapter->nr);
324+
if (!ipmb_dev->miscdev.name)
325+
return -ENOMEM;
326+
324327
ipmb_dev->miscdev.fops = &ipmb_fops;
325328
ipmb_dev->miscdev.parent = &client->dev;
326329
ret = misc_register(&ipmb_dev->miscdev);
@@ -355,11 +358,13 @@ static const struct i2c_device_id ipmb_id[] = {
355358
};
356359
MODULE_DEVICE_TABLE(i2c, ipmb_id);
357360

361+
#ifdef CONFIG_ACPI
358362
static const struct acpi_device_id acpi_ipmb_id[] = {
359363
{ "IPMB0001", 0 },
360364
{},
361365
};
362366
MODULE_DEVICE_TABLE(acpi, acpi_ipmb_id);
367+
#endif
363368

364369
static struct i2c_driver ipmb_driver = {
365370
.driver = {

‎drivers/char/ipmi/ipmi_devintf.c‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,9 @@ static int ipmi_open(struct inode *inode, struct file *file)
122122
static int ipmi_release(struct inode *inode, struct file *file)
123123
{
124124
struct ipmi_file_private *priv = file->private_data;
125-
int rv;
126125
struct ipmi_recv_msg *msg, *next;
127126

128-
rv = ipmi_destroy_user(priv->user);
129-
if (rv)
130-
return rv;
127+
ipmi_destroy_user(priv->user);
131128

132129
list_for_each_entry_safe(msg, next, &priv->recv_msgs, link)
133130
ipmi_free_recv_msg(msg);

‎drivers/char/ipmi/ipmi_msghandler.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1399,13 +1399,11 @@ static void _ipmi_destroy_user(struct ipmi_user *user)
13991399
module_put(owner);
14001400
}
14011401

1402-
int ipmi_destroy_user(struct ipmi_user *user)
1402+
void ipmi_destroy_user(struct ipmi_user *user)
14031403
{
14041404
_ipmi_destroy_user(user);
14051405

14061406
kref_put(&user->refcount, free_user);
1407-
1408-
return 0;
14091407
}
14101408
EXPORT_SYMBOL(ipmi_destroy_user);
14111409

‎drivers/char/ipmi/ipmi_powernv.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ static struct platform_driver powernv_ipmi_driver = {
302302
.of_match_table = ipmi_powernv_match,
303303
},
304304
.probe = ipmi_powernv_probe,
305-
.remove_new = ipmi_powernv_remove,
305+
.remove = ipmi_powernv_remove,
306306
};
307307

308308

‎drivers/char/ipmi/ipmi_poweroff.c‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -699,18 +699,14 @@ static int __init ipmi_poweroff_init(void)
699699
#ifdef MODULE
700700
static void __exit ipmi_poweroff_cleanup(void)
701701
{
702-
int rv;
703-
704702
#ifdef CONFIG_PROC_FS
705703
unregister_sysctl_table(ipmi_table_header);
706704
#endif
707705

708706
ipmi_smi_watcher_unregister(&smi_watcher);
709707

710708
if (ready) {
711-
rv = ipmi_destroy_user(ipmi_user);
712-
if (rv)
713-
pr_err("could not cleanup the IPMI user: 0x%x\n", rv);
709+
ipmi_destroy_user(ipmi_user);
714710
pm_power_off = old_poweroff_func;
715711
}
716712
}

‎drivers/char/ipmi/ipmi_si_pci.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ static int ipmi_pci_probe(struct pci_dev *pdev,
118118
if (io.irq)
119119
io.irq_setup = ipmi_std_irq_setup;
120120

121-
dev_info(&pdev->dev, "%pR regsize %d spacing %d irq %d\n",
121+
dev_info(&pdev->dev, "%pR regsize %u spacing %u irq %d\n",
122122
&pdev->resource[0], io.regsize, io.regspacing, io.irq);
123123

124124
return ipmi_si_add_smi(&io);

‎drivers/char/ipmi/ipmi_si_platform.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ struct platform_driver ipmi_platform_driver = {
445445
.acpi_match_table = ACPI_PTR(acpi_ipmi_match),
446446
},
447447
.probe = ipmi_probe,
448-
.remove_new = ipmi_remove,
448+
.remove = ipmi_remove,
449449
.id_table = si_plat_ids
450450
};
451451

‎drivers/char/ipmi/ipmi_ssif.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2114,7 +2114,7 @@ static struct platform_driver ipmi_driver = {
21142114
.name = DEVICE_NAME,
21152115
},
21162116
.probe = ssif_platform_probe,
2117-
.remove_new = ssif_platform_remove,
2117+
.remove = ssif_platform_remove,
21182118
.id_table = ssif_plat_ids
21192119
};
21202120

‎drivers/char/ipmi/ipmi_watchdog.c‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1064,7 +1064,6 @@ static void ipmi_register_watchdog(int ipmi_intf)
10641064

10651065
static void ipmi_unregister_watchdog(int ipmi_intf)
10661066
{
1067-
int rv;
10681067
struct ipmi_user *loc_user = watchdog_user;
10691068

10701069
if (!loc_user)
@@ -1089,9 +1088,7 @@ static void ipmi_unregister_watchdog(int ipmi_intf)
10891088
mutex_lock(&ipmi_watchdog_mutex);
10901089

10911090
/* Disconnect from IPMI. */
1092-
rv = ipmi_destroy_user(loc_user);
1093-
if (rv)
1094-
pr_warn("error unlinking from IPMI: %d\n", rv);
1091+
ipmi_destroy_user(loc_user);
10951092

10961093
/* If it comes back, restart it properly. */
10971094
ipmi_start_timer_on_heartbeat = 1;

0 commit comments

Comments
 (0)