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

Commit d8ee4ea6 authored by Felipe Balbi's avatar Felipe Balbi Committed by Greg Kroah-Hartman
Browse files

serial: omap: don't access the platform_device 



The driver doesn't need to know about its platform_device.

Everything the driver needs can be done through the
struct device pointer. In case we need to use the
OMAP-specific PM function pointers, those can make
sure to find the device's platform_device pointer
so they can find the struct omap_device through
pdev->archdata field.

Tested-by: default avatarShubhrajyoti D <shubhrajyoti@ti.com>
Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 27788c5f

arch/arm/mach-omap2/serial.c

+9 −6
Original line number Diff line number Diff line
@@ -81,8 +81,9 @@ static struct omap_uart_port_info omap_serial_default_info[] __initdata = { 
};



#ifdef CONFIG_PM

static void omap_uart_enable_wakeup(struct platform_device *pdev, bool enable)

static void omap_uart_enable_wakeup(struct device *dev, bool enable)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct omap_device *od = to_omap_device(pdev);



	if (!od)
@@ -99,15 +100,17 @@ static void omap_uart_enable_wakeup(struct platform_device *pdev, bool enable) 
 * in Smartidle Mode When Configured for DMA Operations.

 * WA: configure uart in force idle mode.

 */

static void omap_uart_set_noidle(struct platform_device *pdev)

static void omap_uart_set_noidle(struct device *dev)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct omap_device *od = to_omap_device(pdev);



	omap_hwmod_set_slave_idlemode(od->hwmods[0], HWMOD_IDLEMODE_NO);

}



static void omap_uart_set_smartidle(struct platform_device *pdev)

static void omap_uart_set_smartidle(struct device *dev)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct omap_device *od = to_omap_device(pdev);

	u8 idlemode;
@@ -120,10 +123,10 @@ static void omap_uart_set_smartidle(struct platform_device *pdev) 
}



#else

static void omap_uart_enable_wakeup(struct platform_device *pdev, bool enable)

static void omap_uart_enable_wakeup(struct device *dev, bool enable)

{}

static void omap_uart_set_noidle(struct platform_device *pdev) {}

static void omap_uart_set_smartidle(struct platform_device *pdev) {}

static void omap_uart_set_noidle(struct device *dev) {}

static void omap_uart_set_smartidle(struct device *dev) {}

#endif /* CONFIG_PM */



#ifdef CONFIG_OMAP_MUX

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

+5 −5
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#define __OMAP_SERIAL_H__



#include <linux/serial_core.h>

#include <linux/platform_device.h>

#include <linux/device.h>

#include <linux/pm_qos.h>



#include <plat/mux.h>
@@ -74,9 +74,9 @@ struct omap_uart_port_info { 
	int			DTR_present;



	int (*get_context_loss_count)(struct device *);

	void (*set_forceidle)(struct platform_device *);

	void (*set_noidle)(struct platform_device *);

	void (*enable_wakeup)(struct platform_device *, bool);

	void (*set_forceidle)(struct device *);

	void (*set_noidle)(struct device *);

	void (*enable_wakeup)(struct device *, bool);

};



struct uart_omap_dma {
@@ -108,7 +108,7 @@ struct uart_omap_dma { 
struct uart_omap_port {

	struct uart_port	port;

	struct uart_omap_dma	uart_dma;

	struct platform_device	*pdev;

	struct device		*dev;



	unsigned char		ier;

	unsigned char		lcr;

drivers/tty/serial/omap-serial.c

+62 −62
Original line number Diff line number Diff line
@@ -104,36 +104,36 @@ static inline void serial_omap_clear_fifos(struct uart_omap_port *up) 


static int serial_omap_get_context_loss_count(struct uart_omap_port *up)

{

	struct omap_uart_port_info *pdata = up->pdev->dev.platform_data;

	struct omap_uart_port_info *pdata = up->dev->platform_data;



	if (!pdata->get_context_loss_count)

		return 0;



	return pdata->get_context_loss_count(&up->pdev->dev);

	return pdata->get_context_loss_count(up->dev);

}



static void serial_omap_set_forceidle(struct uart_omap_port *up)

{

	struct omap_uart_port_info *pdata = up->pdev->dev.platform_data;

	struct omap_uart_port_info *pdata = up->dev->platform_data;



	if (pdata->set_forceidle)

		pdata->set_forceidle(up->pdev);

		pdata->set_forceidle(up->dev);

}



static void serial_omap_set_noidle(struct uart_omap_port *up)

{

	struct omap_uart_port_info *pdata = up->pdev->dev.platform_data;

	struct omap_uart_port_info *pdata = up->dev->platform_data;



	if (pdata->set_noidle)

		pdata->set_noidle(up->pdev);

		pdata->set_noidle(up->dev);

}



static void serial_omap_enable_wakeup(struct uart_omap_port *up, bool enable)

{

	struct omap_uart_port_info *pdata = up->pdev->dev.platform_data;

	struct omap_uart_port_info *pdata = up->dev->platform_data;



	if (pdata->enable_wakeup)

		pdata->enable_wakeup(up->pdev, enable);

		pdata->enable_wakeup(up->dev, enable);

}



/*
@@ -169,8 +169,8 @@ static void serial_omap_stop_rxdma(struct uart_omap_port *up) 
		omap_free_dma(up->uart_dma.rx_dma_channel);

		up->uart_dma.rx_dma_channel = OMAP_UART_DMA_CH_FREE;

		up->uart_dma.rx_dma_used = false;

		pm_runtime_mark_last_busy(&up->pdev->dev);

		pm_runtime_put_autosuspend(&up->pdev->dev);

		pm_runtime_mark_last_busy(up->dev);

		pm_runtime_put_autosuspend(up->dev);

	}

}
@@ -180,16 +180,16 @@ static void serial_omap_enable_ms(struct uart_port *port) 


	dev_dbg(up->port.dev, "serial_omap_enable_ms+%d\n", up->port.line);



	pm_runtime_get_sync(&up->pdev->dev);

	pm_runtime_get_sync(up->dev);

	up->ier |= UART_IER_MSI;

	serial_out(up, UART_IER, up->ier);

	pm_runtime_put(&up->pdev->dev);

	pm_runtime_put(up->dev);

}



static void serial_omap_stop_tx(struct uart_port *port)

{

	struct uart_omap_port *up = to_uart_omap_port(port);

	struct omap_uart_port_info *pdata = up->pdev->dev.platform_data;

	struct omap_uart_port_info *pdata = up->dev->platform_data;



	if (up->use_dma &&

		up->uart_dma.tx_dma_channel != OMAP_UART_DMA_CH_FREE) {
@@ -202,11 +202,11 @@ static void serial_omap_stop_tx(struct uart_port *port) 
		omap_stop_dma(up->uart_dma.tx_dma_channel);

		omap_free_dma(up->uart_dma.tx_dma_channel);

		up->uart_dma.tx_dma_channel = OMAP_UART_DMA_CH_FREE;

		pm_runtime_mark_last_busy(&up->pdev->dev);

		pm_runtime_put_autosuspend(&up->pdev->dev);

		pm_runtime_mark_last_busy(up->dev);

		pm_runtime_put_autosuspend(up->dev);

	}



	pm_runtime_get_sync(&up->pdev->dev);

	pm_runtime_get_sync(up->dev);

	if (up->ier & UART_IER_THRI) {

		up->ier &= ~UART_IER_THRI;

		serial_out(up, UART_IER, up->ier);
@@ -215,22 +215,22 @@ static void serial_omap_stop_tx(struct uart_port *port) 
	if (!up->use_dma && pdata)

		serial_omap_set_forceidle(up);



	pm_runtime_mark_last_busy(&up->pdev->dev);

	pm_runtime_put_autosuspend(&up->pdev->dev);

	pm_runtime_mark_last_busy(up->dev);

	pm_runtime_put_autosuspend(up->dev);

}



static void serial_omap_stop_rx(struct uart_port *port)

{

	struct uart_omap_port *up = to_uart_omap_port(port);



	pm_runtime_get_sync(&up->pdev->dev);

	pm_runtime_get_sync(up->dev);

	if (up->use_dma)

		serial_omap_stop_rxdma(up);

	up->ier &= ~UART_IER_RLSI;

	up->port.read_status_mask &= ~UART_LSR_DR;

	serial_out(up, UART_IER, up->ier);

	pm_runtime_mark_last_busy(&up->pdev->dev);

	pm_runtime_put_autosuspend(&up->pdev->dev);

	pm_runtime_mark_last_busy(up->dev);

	pm_runtime_put_autosuspend(up->dev);

}



static inline void receive_chars(struct uart_omap_port *up,
@@ -348,11 +348,11 @@ static void serial_omap_start_tx(struct uart_port *port) 
	int ret = 0;



	if (!up->use_dma) {

		pm_runtime_get_sync(&up->pdev->dev);

		pm_runtime_get_sync(up->dev);

		serial_omap_enable_ier_thri(up);

		serial_omap_set_noidle(up);

		pm_runtime_mark_last_busy(&up->pdev->dev);

		pm_runtime_put_autosuspend(&up->pdev->dev);

		pm_runtime_mark_last_busy(up->dev);

		pm_runtime_put_autosuspend(up->dev);

		return;

	}
@@ -362,7 +362,7 @@ static void serial_omap_start_tx(struct uart_port *port) 
	xmit = &up->port.state->xmit;



	if (up->uart_dma.tx_dma_channel == OMAP_UART_DMA_CH_FREE) {

		pm_runtime_get_sync(&up->pdev->dev);

		pm_runtime_get_sync(up->dev);

		ret = omap_request_dma(up->uart_dma.uart_dma_tx,

				"UART Tx DMA",

				(void *)uart_tx_dma_callback, up,
@@ -445,11 +445,11 @@ static inline irqreturn_t serial_omap_irq(int irq, void *dev_id) 
	unsigned int iir, lsr;

	unsigned long flags;



	pm_runtime_get_sync(&up->pdev->dev);

	pm_runtime_get_sync(up->dev);

	iir = serial_in(up, UART_IIR);

	if (iir & UART_IIR_NO_INT) {

		pm_runtime_mark_last_busy(&up->pdev->dev);

		pm_runtime_put_autosuspend(&up->pdev->dev);

		pm_runtime_mark_last_busy(up->dev);

		pm_runtime_put_autosuspend(up->dev);

		return IRQ_NONE;

	}
@@ -473,8 +473,8 @@ static inline irqreturn_t serial_omap_irq(int irq, void *dev_id) 
		transmit_chars(up);



	spin_unlock_irqrestore(&up->port.lock, flags);

	pm_runtime_mark_last_busy(&up->pdev->dev);

	pm_runtime_put_autosuspend(&up->pdev->dev);

	pm_runtime_mark_last_busy(up->dev);

	pm_runtime_put_autosuspend(up->dev);



	up->port_activity = jiffies;

	return IRQ_HANDLED;
@@ -486,12 +486,12 @@ static unsigned int serial_omap_tx_empty(struct uart_port *port) 
	unsigned long flags = 0;

	unsigned int ret = 0;



	pm_runtime_get_sync(&up->pdev->dev);

	pm_runtime_get_sync(up->dev);

	dev_dbg(up->port.dev, "serial_omap_tx_empty+%d\n", up->port.line);

	spin_lock_irqsave(&up->port.lock, flags);

	ret = serial_in(up, UART_LSR) & UART_LSR_TEMT ? TIOCSER_TEMT : 0;

	spin_unlock_irqrestore(&up->port.lock, flags);

	pm_runtime_put(&up->pdev->dev);

	pm_runtime_put(up->dev);

	return ret;

}
@@ -501,9 +501,9 @@ static unsigned int serial_omap_get_mctrl(struct uart_port *port) 
	unsigned int status;

	unsigned int ret = 0;



	pm_runtime_get_sync(&up->pdev->dev);

	pm_runtime_get_sync(up->dev);

	status = check_modem_status(up);

	pm_runtime_put(&up->pdev->dev);

	pm_runtime_put(up->dev);



	dev_dbg(up->port.dev, "serial_omap_get_mctrl+%d\n", up->port.line);
@@ -535,11 +535,11 @@ static void serial_omap_set_mctrl(struct uart_port *port, unsigned int mctrl) 
	if (mctrl & TIOCM_LOOP)

		mcr |= UART_MCR_LOOP;



	pm_runtime_get_sync(&up->pdev->dev);

	pm_runtime_get_sync(up->dev);

	up->mcr = serial_in(up, UART_MCR);

	up->mcr |= mcr;

	serial_out(up, UART_MCR, up->mcr);

	pm_runtime_put(&up->pdev->dev);

	pm_runtime_put(up->dev);



	if (gpio_is_valid(up->DTR_gpio) &&

	    !!(mctrl & TIOCM_DTR) != up->DTR_active) {
@@ -558,7 +558,7 @@ static void serial_omap_break_ctl(struct uart_port *port, int break_state) 
	unsigned long flags = 0;



	dev_dbg(up->port.dev, "serial_omap_break_ctl+%d\n", up->port.line);

	pm_runtime_get_sync(&up->pdev->dev);

	pm_runtime_get_sync(up->dev);

	spin_lock_irqsave(&up->port.lock, flags);

	if (break_state == -1)

		up->lcr |= UART_LCR_SBC;
@@ -566,7 +566,7 @@ static void serial_omap_break_ctl(struct uart_port *port, int break_state) 
		up->lcr &= ~UART_LCR_SBC;

	serial_out(up, UART_LCR, up->lcr);

	spin_unlock_irqrestore(&up->port.lock, flags);

	pm_runtime_put(&up->pdev->dev);

	pm_runtime_put(up->dev);

}



static int serial_omap_startup(struct uart_port *port)
@@ -585,7 +585,7 @@ static int serial_omap_startup(struct uart_port *port) 


	dev_dbg(up->port.dev, "serial_omap_startup+%d\n", up->port.line);



	pm_runtime_get_sync(&up->pdev->dev);

	pm_runtime_get_sync(up->dev);

	/*

	 * Clear the FIFO buffers and disable them.

	 * (they will be reenabled in set_termios())
@@ -641,8 +641,8 @@ static int serial_omap_startup(struct uart_port *port) 
	/* Enable module level wake up */

	serial_out(up, UART_OMAP_WER, OMAP_UART_WER_MOD_WKUP);



	pm_runtime_mark_last_busy(&up->pdev->dev);

	pm_runtime_put_autosuspend(&up->pdev->dev);

	pm_runtime_mark_last_busy(up->dev);

	pm_runtime_put_autosuspend(up->dev);

	up->port_activity = jiffies;

	return 0;

}
@@ -654,7 +654,7 @@ static void serial_omap_shutdown(struct uart_port *port) 


	dev_dbg(up->port.dev, "serial_omap_shutdown+%d\n", up->port.line);



	pm_runtime_get_sync(&up->pdev->dev);

	pm_runtime_get_sync(up->dev);

	/*

	 * Disable interrupts from this port

	 */
@@ -689,7 +689,7 @@ static void serial_omap_shutdown(struct uart_port *port) 
		up->uart_dma.rx_buf = NULL;

	}



	pm_runtime_put(&up->pdev->dev);

	pm_runtime_put(up->dev);

	free_irq(up->port.irq, up);

}
@@ -821,7 +821,7 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios, 
	 * Ok, we're now changing the port state. Do it with

	 * interrupts disabled.

	 */

	pm_runtime_get_sync(&up->pdev->dev);

	pm_runtime_get_sync(up->dev);

	spin_lock_irqsave(&up->port.lock, flags);



	/*
@@ -970,7 +970,7 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios, 
	serial_omap_configure_xonxoff(up, termios);



	spin_unlock_irqrestore(&up->port.lock, flags);

	pm_runtime_put(&up->pdev->dev);

	pm_runtime_put(up->dev);

	dev_dbg(up->port.dev, "serial_omap_set_termios+%d\n", up->port.line);

}
@@ -983,7 +983,7 @@ serial_omap_pm(struct uart_port *port, unsigned int state, 


	dev_dbg(up->port.dev, "serial_omap_pm+%d\n", up->port.line);



	pm_runtime_get_sync(&up->pdev->dev);

	pm_runtime_get_sync(up->dev);

	serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);

	efr = serial_in(up, UART_EFR);

	serial_out(up, UART_EFR, efr | UART_EFR_ECB);
@@ -994,14 +994,14 @@ serial_omap_pm(struct uart_port *port, unsigned int state, 
	serial_out(up, UART_EFR, efr);

	serial_out(up, UART_LCR, 0);



	if (!device_may_wakeup(&up->pdev->dev)) {

	if (!device_may_wakeup(up->dev)) {

		if (!state)

			pm_runtime_forbid(&up->pdev->dev);

			pm_runtime_forbid(up->dev);

		else

			pm_runtime_allow(&up->pdev->dev);

			pm_runtime_allow(up->dev);

	}



	pm_runtime_put(&up->pdev->dev);

	pm_runtime_put(up->dev);

}



static void serial_omap_release_port(struct uart_port *port)
@@ -1080,10 +1080,10 @@ static void serial_omap_poll_put_char(struct uart_port *port, unsigned char ch) 
{

	struct uart_omap_port *up = to_uart_omap_port(port);



	pm_runtime_get_sync(&up->pdev->dev);

	pm_runtime_get_sync(up->dev);

	wait_for_xmitr(up);

	serial_out(up, UART_TX, ch);

	pm_runtime_put(&up->pdev->dev);

	pm_runtime_put(up->dev);

}



static int serial_omap_poll_get_char(struct uart_port *port)
@@ -1091,13 +1091,13 @@ static int serial_omap_poll_get_char(struct uart_port *port) 
	struct uart_omap_port *up = to_uart_omap_port(port);

	unsigned int status;



	pm_runtime_get_sync(&up->pdev->dev);

	pm_runtime_get_sync(up->dev);

	status = serial_in(up, UART_LSR);

	if (!(status & UART_LSR_DR))

		return NO_POLL_CHAR;



	status = serial_in(up, UART_RX);

	pm_runtime_put(&up->pdev->dev);

	pm_runtime_put(up->dev);

	return status;

}
@@ -1126,7 +1126,7 @@ serial_omap_console_write(struct console *co, const char *s, 
	unsigned int ier;

	int locked = 1;



	pm_runtime_get_sync(&up->pdev->dev);

	pm_runtime_get_sync(up->dev);



	local_irq_save(flags);

	if (up->port.sysrq)
@@ -1160,8 +1160,8 @@ serial_omap_console_write(struct console *co, const char *s, 
	if (up->msr_saved_flags)

		check_modem_status(up);



	pm_runtime_mark_last_busy(&up->pdev->dev);

	pm_runtime_put_autosuspend(&up->pdev->dev);

	pm_runtime_mark_last_busy(up->dev);

	pm_runtime_put_autosuspend(up->dev);

	if (locked)

		spin_unlock(&up->port.lock);

	local_irq_restore(flags);
@@ -1323,7 +1323,7 @@ static int serial_omap_start_rxdma(struct uart_omap_port *up) 
	int ret = 0;



	if (up->uart_dma.rx_dma_channel == -1) {

		pm_runtime_get_sync(&up->pdev->dev);

		pm_runtime_get_sync(up->dev);

		ret = omap_request_dma(up->uart_dma.uart_dma_rx,

				"UART Rx DMA",

				(void *)uart_rx_dma_callback, up,
@@ -1435,7 +1435,7 @@ static void omap_serial_fill_features_erratas(struct uart_omap_port *up) 
		minor = (mvr & OMAP_UART_MVR_MIN_MASK);

		break;

	default:

		dev_warn(&up->pdev->dev,

		dev_warn(up->dev,

			"Unknown %s revision, defaulting to highest\n",

			up->name);

		/* highest possible revision */
@@ -1535,7 +1535,7 @@ static int serial_omap_probe(struct platform_device *pdev) 
		up->DTR_gpio = -EINVAL;

	up->DTR_active = 0;



	up->pdev = pdev;

	up->dev = &pdev->dev;

	up->port.dev = &pdev->dev;

	up->port.type = PORT_OMAP;

	up->port.iotype = UPIO_MEM;
@@ -1632,7 +1632,7 @@ static int serial_omap_remove(struct platform_device *dev) 
	struct uart_omap_port *up = platform_get_drvdata(dev);



	if (up) {

		pm_runtime_disable(&up->pdev->dev);

		pm_runtime_disable(up->dev);

		uart_remove_one_port(&serial_omap_reg, &up->port);

		pm_qos_remove_request(&up->pm_qos_request);

	}
@@ -1667,7 +1667,7 @@ static void serial_omap_mdr1_errataset(struct uart_omap_port *up, u8 mdr1) 
		timeout--;

		if (!timeout) {

			/* Should *never* happen. we warn and carry on */

			dev_crit(&up->pdev->dev, "Errata i202: timedout %x\n",

			dev_crit(up->dev, "Errata i202: timedout %x\n",

						serial_in(up, UART_LSR));

			break;

		}