Commit eb4d47c8 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 cleanups from Ingo Molnar:
 "Two changes: Propagate const/__initconst, and use ARRAY_SIZE() some
  more"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/events/amd/iommu: Make iommu_pmu const and __initconst
  x86: Use ARRAY_SIZE
parents 6a9f70b0 642e641c
...@@ -241,9 +241,9 @@ static int vga_probe(void) ...@@ -241,9 +241,9 @@ static int vga_probe(void)
vga_modes, vga_modes,
}; };
static int mode_count[] = { static int mode_count[] = {
sizeof(cga_modes)/sizeof(struct mode_info), ARRAY_SIZE(cga_modes),
sizeof(ega_modes)/sizeof(struct mode_info), ARRAY_SIZE(ega_modes),
sizeof(vga_modes)/sizeof(struct mode_info), ARRAY_SIZE(vga_modes),
}; };
struct biosregs ireg, oreg; struct biosregs ireg, oreg;
......
...@@ -65,6 +65,7 @@ ...@@ -65,6 +65,7 @@
#include <linux/elf.h> #include <linux/elf.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/kernel.h>
const char *outfilename; const char *outfilename;
...@@ -151,7 +152,7 @@ extern void bad_put_le(void); ...@@ -151,7 +152,7 @@ extern void bad_put_le(void);
PLE(x, val, 64, PLE(x, val, 32, PLE(x, val, 16, LAST_PLE(x, val)))) PLE(x, val, 64, PLE(x, val, 32, PLE(x, val, 16, LAST_PLE(x, val))))
#define NSYMS (sizeof(required_syms) / sizeof(required_syms[0])) #define NSYMS ARRAY_SIZE(required_syms)
#define BITSFUNC3(name, bits, suffix) name##bits##suffix #define BITSFUNC3(name, bits, suffix) name##bits##suffix
#define BITSFUNC2(name, bits, suffix) BITSFUNC3(name, bits, suffix) #define BITSFUNC2(name, bits, suffix) BITSFUNC3(name, bits, suffix)
......
...@@ -405,7 +405,7 @@ const struct attribute_group *amd_iommu_attr_groups[] = { ...@@ -405,7 +405,7 @@ const struct attribute_group *amd_iommu_attr_groups[] = {
NULL, NULL,
}; };
static struct pmu iommu_pmu = { static const struct pmu iommu_pmu __initconst = {
.event_init = perf_iommu_event_init, .event_init = perf_iommu_event_init,
.add = perf_iommu_add, .add = perf_iommu_add,
.del = perf_iommu_del, .del = perf_iommu_del,
......
...@@ -62,10 +62,9 @@ static struct platform_device pb_device = { ...@@ -62,10 +62,9 @@ static struct platform_device pb_device = {
static int __init pb_keys_init(void) static int __init pb_keys_init(void)
{ {
struct gpio_keys_button *gb = gpio_button; struct gpio_keys_button *gb = gpio_button;
int i, num, good = 0; int i, good = 0;
num = sizeof(gpio_button) / sizeof(struct gpio_keys_button); for (i = 0; i < ARRAY_SIZE(gpio_button); i++) {
for (i = 0; i < num; i++) {
gb[i].gpio = get_gpio_by_name(gb[i].desc); gb[i].gpio = get_gpio_by_name(gb[i].desc);
pr_debug("info[%2d]: name = %s, gpio = %d\n", i, gb[i].desc, pr_debug("info[%2d]: name = %s, gpio = %d\n", i, gb[i].desc,
gb[i].gpio); gb[i].gpio);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment