UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ipmi_si: Remove ipmi_ from the device attr names 

Better conform with kernel style.

Signed-off-by: Corey Minyard <cminyard@mvista.com>
This commit is contained in:
Corey Minyard 2019-07-31 19:46:53 -05:00
parent a6f4c33187
commit 93b6984b31
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/char/ipmi/ipmi_si_intf.c
View File

@ -1587,29 +1587,29 @@ out:
} }
#define IPMI_SI_ATTR(name) \ #define IPMI_SI_ATTR(name) \
static ssize_t ipmi_##name##_show(struct device *dev, \ static ssize_t name##_show(struct device *dev, \
struct device_attribute *attr, \ struct device_attribute *attr, \
char *buf) \ char *buf) \
{ \ { \
struct smi_info *smi_info = dev_get_drvdata(dev); \ struct smi_info *smi_info = dev_get_drvdata(dev); \
\ \
return snprintf(buf, 10, "%u\n", smi_get_stat(smi_info, name)); \ return snprintf(buf, 10, "%u\n", smi_get_stat(smi_info, name)); \
} \ } \
static DEVICE_ATTR(name, 0444, ipmi_##name##_show, NULL) static DEVICE_ATTR(name, 0444, name##_show, NULL)
static ssize_t ipmi_type_show(struct device *dev, static ssize_t type_show(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf) char *buf)
{ {
struct smi_info *smi_info = dev_get_drvdata(dev); struct smi_info *smi_info = dev_get_drvdata(dev);
return snprintf(buf, 10, "%s\n", si_to_str[smi_info->io.si_type]); return snprintf(buf, 10, "%s\n", si_to_str[smi_info->io.si_type]);
} }
static DEVICE_ATTR(type, 0444, ipmi_type_show, NULL); static DEVICE_ATTR(type, 0444, type_show, NULL);
static ssize_t ipmi_interrupts_enabled_show(struct device *dev, static ssize_t interrupts_enabled_show(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf) char *buf)
{ {
struct smi_info *smi_info = dev_get_drvdata(dev); struct smi_info *smi_info = dev_get_drvdata(dev);
int enabled = smi_info->io.irq && !smi_info->interrupt_disabled; int enabled = smi_info->io.irq && !smi_info->interrupt_disabled;
@ -1617,7 +1617,7 @@ static ssize_t ipmi_interrupts_enabled_show(struct device *dev,
return snprintf(buf, 10, "%d\n", enabled); return snprintf(buf, 10, "%d\n", enabled);
} }
static DEVICE_ATTR(interrupts_enabled, 0444, static DEVICE_ATTR(interrupts_enabled, 0444,
ipmi_interrupts_enabled_show, NULL); interrupts_enabled_show, NULL);
IPMI_SI_ATTR(short_timeouts); IPMI_SI_ATTR(short_timeouts);
IPMI_SI_ATTR(long_timeouts); IPMI_SI_ATTR(long_timeouts);
@ -1631,9 +1631,9 @@ IPMI_SI_ATTR(events);
IPMI_SI_ATTR(watchdog_pretimeouts); IPMI_SI_ATTR(watchdog_pretimeouts);
IPMI_SI_ATTR(incoming_messages); IPMI_SI_ATTR(incoming_messages);
static ssize_t ipmi_params_show(struct device *dev, static ssize_t params_show(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf) char *buf)
{ {
struct smi_info *smi_info = dev_get_drvdata(dev); struct smi_info *smi_info = dev_get_drvdata(dev);
@ -1648,7 +1648,7 @@ static ssize_t ipmi_params_show(struct device *dev,
smi_info->io.irq, smi_info->io.irq,
smi_info->io.slave_addr); smi_info->io.slave_addr);
} }
static DEVICE_ATTR(params, 0444, ipmi_params_show, NULL); static DEVICE_ATTR(params, 0444, params_show, NULL);
static struct attribute *ipmi_si_dev_attrs[] = { static struct attribute *ipmi_si_dev_attrs[] = {
&dev_attr_type.attr, &dev_attr_type.attr,