Commit b113737c authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Li Yang
Browse files

soc: fsl: guts: Revert commit 3c0d64e8 



This reverts commit 3c0d64e8
("soc: fsl: guts: reuse machine name from device tree").

A following patch will fix the missing memory allocation failure check
instead.

Suggested-by: default avatarTyrel Datwyler <tyreld@linux.ibm.com>
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarLi Yang <leoyang.li@nxp.com>
parent b80af756

drivers/soc/fsl/guts.c

+3 −4
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ struct fsl_soc_die_attr { 
static struct guts *guts;

static struct soc_device_attribute soc_dev_attr;

static struct soc_device *soc_dev;

static struct device_node *root;





/* SoC die attribute definition for QorIQ platform */
@@ -138,7 +137,7 @@ static u32 fsl_guts_get_svr(void) 


static int fsl_guts_probe(struct platform_device *pdev)

{

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

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

	struct device *dev = &pdev->dev;

	const struct fsl_soc_die_attr *soc_die;

	const char *machine;
@@ -159,8 +158,9 @@ static int fsl_guts_probe(struct platform_device *pdev) 
	root = of_find_node_by_path("/");

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

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

	of_node_put(root);

	if (machine)

		soc_dev_attr.machine = machine;

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



	svr = fsl_guts_get_svr();

	soc_die = fsl_soc_die_match(svr, fsl_soc_die);
@@ -195,7 +195,6 @@ static int fsl_guts_probe(struct platform_device *pdev) 
static int fsl_guts_remove(struct platform_device *dev)

{

	soc_device_unregister(soc_dev);

	of_node_put(root);

	return 0;

}