summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Liu <r64343@freescale.com>2012-01-19 14:04:43 +0800
committerJustin Waters <justin.waters@timesys.com>2012-07-03 16:56:29 -0400
commit3164857532b5cb26b5c5fc5d2e3870dfc9c83d5f (patch)
tree837e4435e3fd671682604e9c6fde706bfb4f1b41
parent6bcc0c9cf6216fe2fb9b79320474f4fd0689d37d (diff)
ENGR00172374-3: flexcan: use irq_set_irq_wake
fix the building errors when upgrade to v3.0 The following commit change the function name: commit a0cd9ca2b907d7ee26575e7b63ac92dad768a75e Author: Thomas Gleixner <tglx@linutronix.de> Date: Thu Feb 10 11:36:33 2011 +0100 genirq: Namespace cleanup The irq namespace has become quite convoluted. My bad. Clean it up and deprecate the old functions. All new functions follow the scheme: irq number based: irq_set/get/xxx/_xxx(unsigned int irq, ...) irq_data based: irq_data_set/get/xxx/_xxx(struct irq_data *d, ....) irq_desc based: irq_desc_get_xxx(struct irq_desc *desc) Signed-off-by: Thomas Gleixner <tglx@linutronix.de> We need give one fix to change the function call name to align this change, - ret = set_irq_wake(dev->irq, 1); + ret = irq_set_irq_wake(dev->irq, 1); Signed-off-by: Jason Liu <r64343@freescale.com>
-rw-r--r--drivers/net/can/flexcan.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 3b6bde598498..27dcf755debc 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -1076,7 +1076,7 @@ static int flexcan_suspend(struct platform_device *pdev, pm_message_t state)
if (priv->version >= FLEXCAN_VER_10_0_12)
mxc_iomux_set_gpr_register(13, 28, 1, 1);
- ret = set_irq_wake(dev->irq, 1);
+ ret = irq_set_irq_wake(dev->irq, 1);
if (ret)
return ret;
@@ -1089,7 +1089,7 @@ static int flexcan_resume(struct platform_device *pdev)
struct flexcan_priv *priv = netdev_priv(dev);
int ret;
- ret = set_irq_wake(dev->irq, 0);
+ ret = irq_set_irq_wake(dev->irq, 0);
if (ret)
return ret;