MIPS: kernel: vpe: Make vpe_attrs an array of pointers.

Markos Chandras · ralfbaechle · commit 1b4676330aa6 · 2013-09-13T15:12:48.000+02:00
Commit 567b21e "mips: convert vpe_class to use dev_groups" broke the build on MIPS since vpe_attrs should be an array of 'struct device_attribute' pointers. Fixes the following build problem: arch/mips/kernel/vpe.c:1372:2: error: missing braces around initializer [-Werror=missing-braces] arch/mips/kernel/vpe.c:1372:2: error: (near initialization for 'vpe_attrs[0]') [-Werror=missing-braces] Cc: Ralf Baechle <ralf@linux-mips.org> Cc: John Crispin <blogic@openwrt.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Markos Chandras <markos.chandras@imgtec.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/5819/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
@@ -1368,7 +1368,7 @@ static ssize_t ntcs_store(struct device *dev, struct device_attribute *attr,
 }
 static DEVICE_ATTR_RW(ntcs);
 
-static struct attribute vpe_attrs[] = {
+static struct attribute *vpe_attrs[] = {
 	&dev_attr_kill.attr,
 	&dev_attr_ntcs.attr,
 	NULL,

Original file line number	Diff line number	Diff line change
`@@ -1368,7 +1368,7 @@ static ssize_t ntcs_store(struct device dev, struct device_attribute attr,`
`1368`	`1368`	`}`
`1369`	`1369`	`static DEVICE_ATTR_RW(ntcs);`
`1370`	`1370`
`1371`		`-static struct attribute vpe_attrs[] = {`
	`1371`	`+static struct attribute *vpe_attrs[] = {`
`1372`	`1372`	`&dev_attr_kill.attr,`
`1373`	`1373`	`&dev_attr_ntcs.attr,`
`1374`	`1374`	`NULL,`