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

Merge tag 'for-linus-5.15-1' of git://github.com/cminyard/linux-ipmi

Pull IPMI updates from Corey Minyard:
"A couple of very minor fixes for style and rate limiting.

Nothing big, but probably needs to go in"

* tag 'for-linus-5.15-1' of git://github.com/cminyard/linux-ipmi:
char: ipmi: use DEVICE_ATTR helper macro
ipmi: rate limit ipmi smi_event failure message

+11 -12
+11 -12
drivers/char/ipmi/ipmi_si_intf.c
··· 591 591 smi_info->handlers->get_result(smi_info->si_sm, msg, 3); 592 592 if (msg[2] != 0) { 593 593 /* Error clearing flags */ 594 - dev_warn(smi_info->io.dev, 594 + dev_warn_ratelimited(smi_info->io.dev, 595 595 "Error clearing flags: %2.2x\n", msg[2]); 596 596 } 597 597 smi_info->si_state = SI_NORMAL; ··· 683 683 /* We got the flags from the SMI, now handle them. */ 684 684 smi_info->handlers->get_result(smi_info->si_sm, msg, 4); 685 685 if (msg[2] != 0) { 686 - dev_warn(smi_info->io.dev, 687 - "Couldn't get irq info: %x.\n", msg[2]); 688 - dev_warn(smi_info->io.dev, 689 - "Maybe ok, but ipmi might run very slowly.\n"); 686 + dev_warn_ratelimited(smi_info->io.dev, 687 + "Couldn't get irq info: %x,\n" 688 + "Maybe ok, but ipmi might run very slowly.\n", 689 + msg[2]); 690 690 smi_info->si_state = SI_NORMAL; 691 691 break; 692 692 } ··· 721 721 722 722 smi_info->handlers->get_result(smi_info->si_sm, msg, 4); 723 723 if (msg[2] != 0) 724 - dev_warn(smi_info->io.dev, 724 + dev_warn_ratelimited(smi_info->io.dev, 725 725 "Could not set the global enables: 0x%x.\n", 726 726 msg[2]); 727 727 ··· 1343 1343 1344 1344 if (cc != IPMI_CC_NO_ERROR && 1345 1345 ++retry_count <= GET_DEVICE_ID_MAX_RETRY) { 1346 - dev_warn(smi_info->io.dev, 1346 + dev_warn_ratelimited(smi_info->io.dev, 1347 1347 "BMC returned 0x%2.2x, retry get bmc device id\n", 1348 1348 cc); 1349 1349 goto retry; ··· 1605 1605 \ 1606 1606 return snprintf(buf, 10, "%u\n", smi_get_stat(smi_info, name)); \ 1607 1607 } \ 1608 - static DEVICE_ATTR(name, 0444, name##_show, NULL) 1608 + static DEVICE_ATTR_RO(name) 1609 1609 1610 1610 static ssize_t type_show(struct device *dev, 1611 1611 struct device_attribute *attr, ··· 1615 1615 1616 1616 return snprintf(buf, 10, "%s\n", si_to_str[smi_info->io.si_type]); 1617 1617 } 1618 - static DEVICE_ATTR(type, 0444, type_show, NULL); 1618 + static DEVICE_ATTR_RO(type); 1619 1619 1620 1620 static ssize_t interrupts_enabled_show(struct device *dev, 1621 1621 struct device_attribute *attr, ··· 1626 1626 1627 1627 return snprintf(buf, 10, "%d\n", enabled); 1628 1628 } 1629 - static DEVICE_ATTR(interrupts_enabled, 0444, 1630 - interrupts_enabled_show, NULL); 1629 + static DEVICE_ATTR_RO(interrupts_enabled); 1631 1630 1632 1631 IPMI_SI_ATTR(short_timeouts); 1633 1632 IPMI_SI_ATTR(long_timeouts); ··· 1657 1658 smi_info->io.irq, 1658 1659 smi_info->io.slave_addr); 1659 1660 } 1660 - static DEVICE_ATTR(params, 0444, params_show, NULL); 1661 + static DEVICE_ATTR_RO(params); 1661 1662 1662 1663 static struct attribute *ipmi_si_dev_attrs[] = { 1663 1664 &dev_attr_type.attr,