Commit 1791596b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 56c24438 bf064c7b

drivers/char/ipmi/ipmi_si_intf.c

+11 −12
Original line number Diff line number Diff line
@@ -591,7 +591,7 @@ static void handle_transaction_done(struct smi_info *smi_info) 
		smi_info->handlers->get_result(smi_info->si_sm, msg, 3);

		if (msg[2] != 0) {

			/* Error clearing flags */

			dev_warn(smi_info->io.dev,

			dev_warn_ratelimited(smi_info->io.dev,

				 "Error clearing flags: %2.2x\n", msg[2]);

		}

		smi_info->si_state = SI_NORMAL;
@@ -683,10 +683,10 @@ static void handle_transaction_done(struct smi_info *smi_info) 
		/* We got the flags from the SMI, now handle them. */

		smi_info->handlers->get_result(smi_info->si_sm, msg, 4);

		if (msg[2] != 0) {

			dev_warn(smi_info->io.dev,

				 "Couldn't get irq info: %x.\n", msg[2]);

			dev_warn(smi_info->io.dev,

				 "Maybe ok, but ipmi might run very slowly.\n");

			dev_warn_ratelimited(smi_info->io.dev,

				"Couldn't get irq info: %x,\n"

				"Maybe ok, but ipmi might run very slowly.\n",

				msg[2]);

			smi_info->si_state = SI_NORMAL;

			break;

		}
@@ -721,7 +721,7 @@ static void handle_transaction_done(struct smi_info *smi_info) 


		smi_info->handlers->get_result(smi_info->si_sm, msg, 4);

		if (msg[2] != 0)

			dev_warn(smi_info->io.dev,

			dev_warn_ratelimited(smi_info->io.dev,

				 "Could not set the global enables: 0x%x.\n",

				 msg[2]);
@@ -1343,7 +1343,7 @@ static int try_get_dev_id(struct smi_info *smi_info) 


		if (cc != IPMI_CC_NO_ERROR &&

		    ++retry_count <= GET_DEVICE_ID_MAX_RETRY) {

			dev_warn(smi_info->io.dev,

			dev_warn_ratelimited(smi_info->io.dev,

			    "BMC returned 0x%2.2x, retry get bmc device id\n",

			    cc);

			goto retry;
@@ -1605,7 +1605,7 @@ static ssize_t name##_show(struct device *dev, \ 
									\

	return snprintf(buf, 10, "%u\n", smi_get_stat(smi_info, name));	\

}									\

static DEVICE_ATTR(name, 0444, name##_show, NULL)

static DEVICE_ATTR_RO(name)



static ssize_t type_show(struct device *dev,

			 struct device_attribute *attr,
@@ -1615,7 +1615,7 @@ static ssize_t type_show(struct device *dev, 


	return snprintf(buf, 10, "%s\n", si_to_str[smi_info->io.si_type]);

}

static DEVICE_ATTR(type, 0444, type_show, NULL);

static DEVICE_ATTR_RO(type);



static ssize_t interrupts_enabled_show(struct device *dev,

				       struct device_attribute *attr,
@@ -1626,8 +1626,7 @@ static ssize_t interrupts_enabled_show(struct device *dev, 


	return snprintf(buf, 10, "%d\n", enabled);

}

static DEVICE_ATTR(interrupts_enabled, 0444,

		   interrupts_enabled_show, NULL);

static DEVICE_ATTR_RO(interrupts_enabled);



IPMI_SI_ATTR(short_timeouts);

IPMI_SI_ATTR(long_timeouts);
@@ -1658,7 +1657,7 @@ static ssize_t params_show(struct device *dev, 
			smi_info->io.irq,

			smi_info->io.slave_addr);

}

static DEVICE_ATTR(params, 0444, params_show, NULL);

static DEVICE_ATTR_RO(params);



static struct attribute *ipmi_si_dev_attrs[] = {

	&dev_attr_type.attr,