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

Commit 8f0d69de authored by Kevin Hilman's avatar Kevin Hilman Committed by Paul Walmsley
Browse files

OMAP: omap_device: replace _find_by_pdev() with to_omap_device() 



The omap_device layer currently has two ways of getting an omap_device
pointer from a platform_device pointer.

Replace current usage of _find_by_pdev() with to_omap_device() since
to_omap_device() is more familiar to the existing to_platform_device()
used when getting a platform_device pointer from a struct device pointer.

Cc: Felipe Balbi <balbi@ti.com>
Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
Reviewed-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent ecba3287

arch/arm/plat-omap/omap_device.c

+5 −10
Original line number Diff line number Diff line
@@ -236,11 +236,6 @@ static int _omap_device_deactivate(struct omap_device *od, u8 ignore_lat) 
	return 0;

}



static inline struct omap_device *_find_by_pdev(struct platform_device *pdev)

{

	return container_of(pdev, struct omap_device, pdev);

}



/**

 * _add_optional_clock_clkdev - Add clkdev entry for hwmod optional clocks

 * @od: struct omap_device *od
@@ -316,7 +311,7 @@ u32 omap_device_get_context_loss_count(struct platform_device *pdev) 
	struct omap_device *od;

	u32 ret = 0;



	od = _find_by_pdev(pdev);

	od = to_omap_device(pdev);



	if (od->hwmods_cnt)

		ret = omap_hwmod_get_context_loss_count(od->hwmods[0]);
@@ -611,7 +606,7 @@ int omap_device_enable(struct platform_device *pdev) 
	int ret;

	struct omap_device *od;



	od = _find_by_pdev(pdev);

	od = to_omap_device(pdev);



	if (od->_state == OMAP_DEVICE_STATE_ENABLED) {

		WARN(1, "omap_device: %s.%d: %s() called from invalid state %d\n",
@@ -650,7 +645,7 @@ int omap_device_idle(struct platform_device *pdev) 
	int ret;

	struct omap_device *od;



	od = _find_by_pdev(pdev);

	od = to_omap_device(pdev);



	if (od->_state != OMAP_DEVICE_STATE_ENABLED) {

		WARN(1, "omap_device: %s.%d: %s() called from invalid state %d\n",
@@ -681,7 +676,7 @@ int omap_device_shutdown(struct platform_device *pdev) 
	int ret, i;

	struct omap_device *od;



	od = _find_by_pdev(pdev);

	od = to_omap_device(pdev);



	if (od->_state != OMAP_DEVICE_STATE_ENABLED &&

	    od->_state != OMAP_DEVICE_STATE_IDLE) {
@@ -722,7 +717,7 @@ int omap_device_align_pm_lat(struct platform_device *pdev, 
	int ret = -EINVAL;

	struct omap_device *od;



	od = _find_by_pdev(pdev);

	od = to_omap_device(pdev);



	if (new_wakeup_lat_limit == od->dev_wakeup_lat)

		return 0;