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

Commit 9f8b6949 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

OMAP: omap_device: _disable_idle_on_suspend() takes platform_device pointer 



Public omap_device functions need to take platform_device pointers,
conversion to omap_device pointers is done internal to the omap_device
layer.

Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
parent bfae4f8f

arch/arm/mach-omap2/gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused) 
		return PTR_ERR(pdev);

	}



	omap_device_disable_idle_on_suspend(od);

	omap_device_disable_idle_on_suspend(pdev);



	gpio_bank_count++;

	return 0;

arch/arm/mach-omap2/serial.c

+1 −1
Original line number Diff line number Diff line
@@ -805,7 +805,7 @@ void __init omap_serial_init_port(struct omap_board_data *bdata) 
	WARN(IS_ERR(pdev), "Could not build omap_device for %s: %s.\n",

	     name, oh->name);



	omap_device_disable_idle_on_suspend(od);

	omap_device_disable_idle_on_suspend(pdev);

	oh->mux = omap_hwmod_mux_init(bdata->pads, bdata->pads_cnt);



	uart->irq = oh->mpu_irqs[0].irq;

arch/arm/plat-omap/include/plat/omap_device.h

+8 −5
Original line number Diff line number Diff line
@@ -116,11 +116,6 @@ int omap_device_enable_hwmods(struct omap_device *od); 
int omap_device_disable_clocks(struct omap_device *od);

int omap_device_enable_clocks(struct omap_device *od);



static inline void omap_device_disable_idle_on_suspend(struct omap_device *od)

{

	od->flags |= OMAP_DEVICE_NO_IDLE_ON_SUSPEND;

}



/*

 * Entries should be kept in latency order ascending

 *
@@ -153,4 +148,12 @@ struct omap_device_pm_latency { 
/* Get omap_device pointer from platform_device pointer */

#define to_omap_device(x) container_of((x), struct omap_device, pdev)



static inline

void omap_device_disable_idle_on_suspend(struct platform_device *pdev)

{

	struct omap_device *od = to_omap_device(pdev);



	od->flags |= OMAP_DEVICE_NO_IDLE_ON_SUSPEND;

}



#endif