Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1d1cd59 authored by Paul Walmsley's avatar Paul Walmsley
Browse files

ARM: OMAP2+: omap_device: remove obsolete pm_lats and early_device code 



Remove now-obsolete code from arch/arm/mach-omap2/omap_device.c.  This
mostly consists of removing the first attempt at device PM latency
handling.  This was never really used, has been replaced by the common
dev_pm_qos code, and needs to go away as part of the DT conversion.
Also, the early platform_device creation code has been removed, as it
appears to be unused.

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
parent 949db153

arch/arm/mach-omap2/am35xx-emac.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static int __init omap_davinci_emac_dev_init(struct omap_hwmod *oh, 
	struct platform_device *pdev;



	pdev = omap_device_build(oh->class->name, 0, oh, pdata, pdata_len,

				 NULL, 0, false);

				 false);

	if (IS_ERR(pdev)) {

		WARN(1, "Can't build omap_device for %s:%s.\n",

		     oh->class->name, oh->name);

arch/arm/mach-omap2/devices.c

+10 −15
Original line number Diff line number Diff line
@@ -61,8 +61,7 @@ static int __init omap3_l3_init(void) 
	if (!oh)

		pr_err("could not look up %s\n", oh_name);



	pdev = omap_device_build("omap_l3_smx", 0, oh, NULL, 0,

							   NULL, 0, 0);

	pdev = omap_device_build("omap_l3_smx", 0, oh, NULL, 0);



	WARN(IS_ERR(pdev), "could not build omap_device for %s\n", oh_name);
@@ -96,8 +95,7 @@ static int __init omap4_l3_init(void) 
			pr_err("could not look up %s\n", oh_name);

	}



	pdev = omap_device_build_ss("omap_l3_noc", 0, oh, 3, NULL,

						     0, NULL, 0, 0);

	pdev = omap_device_build_ss("omap_l3_noc", 0, oh, 3, NULL, 0);



	WARN(IS_ERR(pdev), "could not build omap_device for %s\n", oh_name);
@@ -273,7 +271,7 @@ int __init omap4_keyboard_init(struct omap4_keypad_platform_data 
	keypad_data = sdp4430_keypad_data;



	pdev = omap_device_build(name, id, oh, keypad_data,

			sizeof(struct omap4_keypad_platform_data), NULL, 0, 0);

				 sizeof(struct omap4_keypad_platform_data));



	if (IS_ERR(pdev)) {

		WARN(1, "Can't build omap_device for %s:%s.\n",
@@ -297,7 +295,7 @@ static inline void __init omap_init_mbox(void) 
		return;

	}



	pdev = omap_device_build("omap-mailbox", -1, oh, NULL, 0, NULL, 0, 0);

	pdev = omap_device_build("omap-mailbox", -1, oh, NULL, 0);

	WARN(IS_ERR(pdev), "%s: could not build device, err %ld\n",

						__func__, PTR_ERR(pdev));

}
@@ -337,7 +335,7 @@ static void __init omap_init_mcpdm(void) 
		return;

	}



	pdev = omap_device_build("omap-mcpdm", -1, oh, NULL, 0, NULL, 0, 0);

	pdev = omap_device_build("omap-mcpdm", -1, oh, NULL, 0);

	WARN(IS_ERR(pdev), "Can't build omap_device for omap-mcpdm.\n");

}

#else
@@ -358,7 +356,7 @@ static void __init omap_init_dmic(void) 
		return;

	}



	pdev = omap_device_build("omap-dmic", -1, oh, NULL, 0, NULL, 0, 0);

	pdev = omap_device_build("omap-dmic", -1, oh, NULL, 0);

	WARN(IS_ERR(pdev), "Can't build omap_device for omap-dmic.\n");

}

#else
@@ -384,8 +382,7 @@ static void __init omap_init_hdmi_audio(void) 
		return;

	}



	pdev = omap_device_build("omap-hdmi-audio-dai",

		-1, oh, NULL, 0, NULL, 0, 0);

	pdev = omap_device_build("omap-hdmi-audio-dai", -1, oh, NULL, 0, 0);

	WARN(IS_ERR(pdev),

	     "Can't build omap_device for omap-hdmi-audio-dai.\n");
@@ -429,8 +426,7 @@ static int __init omap_mcspi_init(struct omap_hwmod *oh, void *unused) 
	}



	spi_num++;

	pdev = omap_device_build(name, spi_num, oh, pdata,

				sizeof(*pdata),	NULL, 0, 0);

	pdev = omap_device_build(name, spi_num, oh, pdata, sizeof(*pdata));

	WARN(IS_ERR(pdev), "Can't build omap_device for %s:%s\n",

				name, oh->name);

	kfree(pdata);
@@ -460,7 +456,7 @@ static void omap_init_rng(void) 
	if (!oh)

		return;



	pdev = omap_device_build("omap_rng", -1, oh, NULL, 0, NULL, 0, 0);

	pdev = omap_device_build("omap_rng", -1, oh, NULL, 0);

	WARN(IS_ERR(pdev), "Can't build omap_device for omap_rng\n");

}
@@ -689,8 +685,7 @@ static void __init omap_init_ocp2scp(void) 


	pdata->dev_cnt	= dev_cnt;



	pdev = omap_device_build(name, bus_id, oh, pdata, sizeof(*pdata), NULL,

								0, false);

	pdev = omap_device_build(name, bus_id, oh, pdata, sizeof(*pdata));

	if (IS_ERR(pdev)) {

		pr_err("Could not build omap_device for %s %s\n",

						name, oh_name);

arch/arm/mach-omap2/display.c

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ static struct platform_device *create_dss_pdev(const char *pdev_name, 
		dev_set_name(&pdev->dev, "%s", pdev->name);



	ohs[0] = oh;

	od = omap_device_alloc(pdev, ohs, 1, NULL, 0);

	od = omap_device_alloc(pdev, ohs, 1);

	if (IS_ERR(od)) {

		pr_err("Could not alloc omap_device for %s\n", pdev_name);

		r = -ENOMEM;

arch/arm/mach-omap2/dma.c

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ static int __init omap2_system_dma_init_dev(struct omap_hwmod *oh, void *unused) 


	p->errata		= configure_dma_errata();



	pdev = omap_device_build(name, 0, oh, p, sizeof(*p), NULL, 0, 0);

	pdev = omap_device_build(name, 0, oh, p, sizeof(*p));

	kfree(p);

	if (IS_ERR(pdev)) {

		pr_err("%s: Can't build omap_device for %s:%s.\n",

arch/arm/mach-omap2/drm.c

+1 −2
Original line number Diff line number Diff line
@@ -51,8 +51,7 @@ static int __init omap_init_drm(void) 
	oh = omap_hwmod_lookup("dmm");



	if (oh) {

		pdev = omap_device_build(oh->name, -1, oh, NULL, 0, NULL, 0,

					false);

		pdev = omap_device_build(oh->name, -1, oh, NULL, 0);

		WARN(IS_ERR(pdev), "Could not build omap_device for %s\n",

			oh->name);

	}