diff options
author | Corey Minyard <cminyard@mvista.com> | 2017-06-09 17:35:18 -0400 |
---|---|---|
committer | Corey Minyard <cminyard@mvista.com> | 2017-06-09 17:36:49 -0400 |
commit | 1adc9105bbf8831d31f764ca8d1b99696e5dedba (patch) | |
tree | 5be603ab1e8b11116294d4ffae56252a9c8df55f | |
parent | bf10ff69dd6e27710b21863ebd8e6504d9516222 (diff) |
ipmi: Use the proper default value for register size in ACPI
It's the proper value, so there's no effect, but just to be proper,
use the right value.
Signed-off-by: Corey Minyard <cminyard@mvista.com>
-rw-r--r-- | drivers/char/ipmi/ipmi_si_intf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index b2b618f066e0..b89078bff1c1 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c | |||
@@ -1942,7 +1942,7 @@ static int hotmod_handler(const char *val, struct kernel_param *kp) | |||
1942 | info->io.regspacing = DEFAULT_REGSPACING; | 1942 | info->io.regspacing = DEFAULT_REGSPACING; |
1943 | info->io.regsize = regsize; | 1943 | info->io.regsize = regsize; |
1944 | if (!info->io.regsize) | 1944 | if (!info->io.regsize) |
1945 | info->io.regsize = DEFAULT_REGSPACING; | 1945 | info->io.regsize = DEFAULT_REGSIZE; |
1946 | info->io.regshift = regshift; | 1946 | info->io.regshift = regshift; |
1947 | info->irq = irq; | 1947 | info->irq = irq; |
1948 | if (info->irq) | 1948 | if (info->irq) |
@@ -2036,7 +2036,7 @@ static int hardcode_find_bmc(void) | |||
2036 | info->io.regspacing = DEFAULT_REGSPACING; | 2036 | info->io.regspacing = DEFAULT_REGSPACING; |
2037 | info->io.regsize = regsizes[i]; | 2037 | info->io.regsize = regsizes[i]; |
2038 | if (!info->io.regsize) | 2038 | if (!info->io.regsize) |
2039 | info->io.regsize = DEFAULT_REGSPACING; | 2039 | info->io.regsize = DEFAULT_REGSIZE; |
2040 | info->io.regshift = regshifts[i]; | 2040 | info->io.regshift = regshifts[i]; |
2041 | info->irq = irqs[i]; | 2041 | info->irq = irqs[i]; |
2042 | if (info->irq) | 2042 | if (info->irq) |
@@ -2395,7 +2395,7 @@ static void try_init_dmi(struct dmi_ipmi_data *ipmi_data) | |||
2395 | info->io.regspacing = ipmi_data->offset; | 2395 | info->io.regspacing = ipmi_data->offset; |
2396 | if (!info->io.regspacing) | 2396 | if (!info->io.regspacing) |
2397 | info->io.regspacing = DEFAULT_REGSPACING; | 2397 | info->io.regspacing = DEFAULT_REGSPACING; |
2398 | info->io.regsize = DEFAULT_REGSPACING; | 2398 | info->io.regsize = DEFAULT_REGSIZE; |
2399 | info->io.regshift = 0; | 2399 | info->io.regshift = 0; |
2400 | 2400 | ||
2401 | info->slave_addr = ipmi_data->slave_addr; | 2401 | info->slave_addr = ipmi_data->slave_addr; |
@@ -2761,7 +2761,7 @@ static int acpi_ipmi_probe(struct platform_device *dev) | |||
2761 | info->io.regspacing = | 2761 | info->io.regspacing = |
2762 | res_second->start - info->io.addr_data; | 2762 | res_second->start - info->io.addr_data; |
2763 | } | 2763 | } |
2764 | info->io.regsize = DEFAULT_REGSPACING; | 2764 | info->io.regsize = DEFAULT_REGSIZE; |
2765 | info->io.regshift = 0; | 2765 | info->io.regshift = 0; |
2766 | 2766 | ||
2767 | /* If _GPE exists, use it; otherwise use standard interrupts */ | 2767 | /* If _GPE exists, use it; otherwise use standard interrupts */ |