aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/i8k.c4
-rw-r--r--drivers/char/ipmi/ipmi_si_intf.c9
2 files changed, 7 insertions, 6 deletions
diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
index 0289705967de..cd406416effd 100644
--- a/drivers/char/i8k.c
+++ b/drivers/char/i8k.c
@@ -98,9 +98,9 @@ struct smm_regs {
98 unsigned int edi __attribute__ ((packed)); 98 unsigned int edi __attribute__ ((packed));
99}; 99};
100 100
101static inline char *i8k_get_dmi_data(int field) 101static inline const char *i8k_get_dmi_data(int field)
102{ 102{
103 char *dmi_data = dmi_get_system_info(field); 103 const char *dmi_data = dmi_get_system_info(field);
104 104
105 return dmi_data && *dmi_data ? dmi_data : "?"; 105 return dmi_data && *dmi_data ? dmi_data : "?";
106} 106}
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index dd441ff4af56..7901d5f218ec 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -1965,10 +1965,10 @@ struct dmi_ipmi_data
1965 u8 slave_addr; 1965 u8 slave_addr;
1966}; 1966};
1967 1967
1968static int __devinit decode_dmi(struct dmi_header *dm, 1968static int __devinit decode_dmi(const struct dmi_header *dm,
1969 struct dmi_ipmi_data *dmi) 1969 struct dmi_ipmi_data *dmi)
1970{ 1970{
1971 u8 *data = (u8 *)dm; 1971 const u8 *data = (const u8 *)dm;
1972 unsigned long base_addr; 1972 unsigned long base_addr;
1973 u8 reg_spacing; 1973 u8 reg_spacing;
1974 u8 len = dm->length; 1974 u8 len = dm->length;
@@ -2091,13 +2091,14 @@ static __devinit void try_init_dmi(struct dmi_ipmi_data *ipmi_data)
2091 2091
2092static void __devinit dmi_find_bmc(void) 2092static void __devinit dmi_find_bmc(void)
2093{ 2093{
2094 struct dmi_device *dev = NULL; 2094 const struct dmi_device *dev = NULL;
2095 struct dmi_ipmi_data data; 2095 struct dmi_ipmi_data data;
2096 int rv; 2096 int rv;
2097 2097
2098 while ((dev = dmi_find_device(DMI_DEV_TYPE_IPMI, NULL, dev))) { 2098 while ((dev = dmi_find_device(DMI_DEV_TYPE_IPMI, NULL, dev))) {
2099 memset(&data, 0, sizeof(data)); 2099 memset(&data, 0, sizeof(data));
2100 rv = decode_dmi((struct dmi_header *) dev->device_data, &data); 2100 rv = decode_dmi((const struct dmi_header *) dev->device_data,
2101 &data);
2101 if (!rv) 2102 if (!rv)
2102 try_init_dmi(&data); 2103 try_init_dmi(&data);
2103 } 2104 }