Commit 5d707e4e authored by Michael Walle's avatar Michael Walle Committed by Shawn Guo
Browse files

soc: fsl: guts: allocate soc_dev_attr on the heap 



This is the last global static variable. Drop it and allocate the memory
on the heap instead.

Signed-off-by: default avatarMichael Walle <michael@walle.cc>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent ab4988d6

drivers/soc/fsl/guts.c

+21 −19
Original line number Diff line number Diff line
@@ -20,9 +20,6 @@ struct fsl_soc_die_attr { 
	u32	mask;

};



static struct soc_device_attribute soc_dev_attr;





/* SoC die attribute definition for QorIQ platform */

static const struct fsl_soc_die_attr fsl_soc_die[] = {

	/*
@@ -116,6 +113,7 @@ static const struct fsl_soc_die_attr *fsl_soc_die_match( 
static int fsl_guts_probe(struct platform_device *pdev)

{

	struct device_node *root, *np = pdev->dev.of_node;

	struct soc_device_attribute *soc_dev_attr;

	static struct soc_device *soc_dev;

	struct device *dev = &pdev->dev;

	const struct fsl_soc_die_attr *soc_die;
@@ -136,12 +134,16 @@ static int fsl_guts_probe(struct platform_device *pdev) 
	iounmap(regs);



	/* Register soc device */

	soc_dev_attr = devm_kzalloc(dev, sizeof(*soc_dev_attr), GFP_KERNEL);

	if (!soc_dev_attr)

		return -ENOMEM;



	root = of_find_node_by_path("/");

	if (of_property_read_string(root, "model", &machine))

		of_property_read_string_index(root, "compatible", 0, &machine);

	if (machine) {

		soc_dev_attr.machine = devm_kstrdup(dev, machine, GFP_KERNEL);

		if (!soc_dev_attr.machine) {

		soc_dev_attr->machine = devm_kstrdup(dev, machine, GFP_KERNEL);

		if (!soc_dev_attr->machine) {

			of_node_put(root);

			return -ENOMEM;

		}
@@ -150,30 +152,30 @@ static int fsl_guts_probe(struct platform_device *pdev) 


	soc_die = fsl_soc_die_match(svr, fsl_soc_die);

	if (soc_die) {

		soc_dev_attr.family = devm_kasprintf(dev, GFP_KERNEL,

		soc_dev_attr->family = devm_kasprintf(dev, GFP_KERNEL,

						      "QorIQ %s", soc_die->die);

	} else {

		soc_dev_attr.family = devm_kasprintf(dev, GFP_KERNEL, "QorIQ");

		soc_dev_attr->family = devm_kasprintf(dev, GFP_KERNEL, "QorIQ");

	}

	if (!soc_dev_attr.family)

	if (!soc_dev_attr->family)

		return -ENOMEM;

	soc_dev_attr.soc_id = devm_kasprintf(dev, GFP_KERNEL,

	soc_dev_attr->soc_id = devm_kasprintf(dev, GFP_KERNEL,

					      "svr:0x%08x", svr);

	if (!soc_dev_attr.soc_id)

	if (!soc_dev_attr->soc_id)

		return -ENOMEM;

	soc_dev_attr.revision = devm_kasprintf(dev, GFP_KERNEL, "%d.%d",

	soc_dev_attr->revision = devm_kasprintf(dev, GFP_KERNEL, "%d.%d",

						(svr >>  4) & 0xf, svr & 0xf);

	if (!soc_dev_attr.revision)

	if (!soc_dev_attr->revision)

		return -ENOMEM;



	soc_dev = soc_device_register(&soc_dev_attr);

	soc_dev = soc_device_register(soc_dev_attr);

	if (IS_ERR(soc_dev))

		return PTR_ERR(soc_dev);



	pr_info("Machine: %s\n", soc_dev_attr.machine);

	pr_info("SoC family: %s\n", soc_dev_attr.family);

	pr_info("Machine: %s\n", soc_dev_attr->machine);

	pr_info("SoC family: %s\n", soc_dev_attr->family);

	pr_info("SoC ID: %s, Revision: %s\n",

		soc_dev_attr.soc_id, soc_dev_attr.revision);

		soc_dev_attr->soc_id, soc_dev_attr->revision);

	return 0;

}