Commit 6a341fdf authored by Thierry Reding's avatar Thierry Reding
Browse files

gpu: host1x: Use of_device_get_match_data()



Avoid some boilerplate by calling of_device_get_match_data() instead of
open-coding the equivalent in the driver.

While at it, shuffle around some code to avoid unnecessary local
variables.

Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 9e66317d
Loading
Loading
Loading
Loading
+5 −9
Original line number Original line Diff line number Diff line
@@ -116,15 +116,16 @@ MODULE_DEVICE_TABLE(of, host1x_of_match);


static int host1x_probe(struct platform_device *pdev)
static int host1x_probe(struct platform_device *pdev)
{
{
	const struct of_device_id *id;
	struct host1x *host;
	struct host1x *host;
	struct resource *regs;
	struct resource *regs;
	int syncpt_irq;
	int syncpt_irq;
	int err;
	int err;


	id = of_match_device(host1x_of_match, &pdev->dev);
	host = devm_kzalloc(&pdev->dev, sizeof(*host), GFP_KERNEL);
	if (!id)
	if (!host)
		return -EINVAL;
		return -ENOMEM;

	host->info = of_device_get_match_data(&pdev->dev);


	regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
	regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
	if (!regs) {
	if (!regs) {
@@ -138,15 +139,10 @@ static int host1x_probe(struct platform_device *pdev)
		return syncpt_irq;
		return syncpt_irq;
	}
	}


	host = devm_kzalloc(&pdev->dev, sizeof(*host), GFP_KERNEL);
	if (!host)
		return -ENOMEM;

	mutex_init(&host->devices_lock);
	mutex_init(&host->devices_lock);
	INIT_LIST_HEAD(&host->devices);
	INIT_LIST_HEAD(&host->devices);
	INIT_LIST_HEAD(&host->list);
	INIT_LIST_HEAD(&host->list);
	host->dev = &pdev->dev;
	host->dev = &pdev->dev;
	host->info = id->data;


	/* set common host1x device data */
	/* set common host1x device data */
	platform_set_drvdata(pdev, host);
	platform_set_drvdata(pdev, host);