diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2015-01-14 14:39:07 -0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-02-02 10:11:25 -0800 |
| commit | 6960cd465e553c8c0f9c26663b32bf3f3cd6a298 (patch) | |
| tree | ba1ca5a950ad62f054f17018f0597f0e9b03a271 /drivers/tty/serial | |
| parent | c0b18db0562738eee578b7cd2291bd2851f6b5f8 (diff) | |
| download | blackbird-obmc-linux-6960cd465e553c8c0f9c26663b32bf3f3cd6a298.tar.gz blackbird-obmc-linux-6960cd465e553c8c0f9c26663b32bf3f3cd6a298.zip | |
serial: mxs-auart: Remove irq from private structure
The irq number is only used inside the probe function, so there is no need
to keep it in the private mxs_auart_port structure.
Use a local 'irq' variable for storing the irq number instead.
Also make its type of 'int' as platform_get_irq() may fail and return a
negative number.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial')
| -rw-r--r-- | drivers/tty/serial/mxs-auart.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c index 1e9fb370600b..767fddaa7576 100644 --- a/drivers/tty/serial/mxs-auart.c +++ b/drivers/tty/serial/mxs-auart.c @@ -152,8 +152,6 @@ struct mxs_auart_port { unsigned int mctrl_prev; enum mxs_auart_type devtype; - unsigned int irq; - struct clk *clk; struct device *dev; @@ -1228,7 +1226,7 @@ static int mxs_auart_probe(struct platform_device *pdev) of_match_device(mxs_auart_dt_ids, &pdev->dev); struct mxs_auart_port *s; u32 version; - int ret = 0; + int ret = 0, irq; struct resource *r; s = devm_kzalloc(&pdev->dev, sizeof(*s), GFP_KERNEL); @@ -1266,9 +1264,9 @@ static int mxs_auart_probe(struct platform_device *pdev) s->mctrl_prev = 0; - s->irq = platform_get_irq(pdev, 0); - s->port.irq = s->irq; - ret = devm_request_irq(&pdev->dev, s->irq, mxs_auart_irq_handle, 0, + irq = platform_get_irq(pdev, 0); + s->port.irq = irq; + ret = devm_request_irq(&pdev->dev, irq, mxs_auart_irq_handle, 0, dev_name(&pdev->dev), s); if (ret) return ret; |
