diff options
Diffstat (limited to 'drivers/clocksource/timer-ti-dm.c')
| -rw-r--r-- | drivers/clocksource/timer-ti-dm.c | 20 | 
1 files changed, 5 insertions, 15 deletions
diff --git a/drivers/clocksource/timer-ti-dm.c b/drivers/clocksource/timer-ti-dm.c index 5394d9dbdfbc..269a994d6a99 100644 --- a/drivers/clocksource/timer-ti-dm.c +++ b/drivers/clocksource/timer-ti-dm.c @@ -780,7 +780,6 @@ static int omap_dm_timer_probe(struct platform_device *pdev)  {  	unsigned long flags;  	struct omap_dm_timer *timer; -	struct resource *mem, *irq;  	struct device *dev = &pdev->dev;  	const struct dmtimer_platform_data *pdata;  	int ret; @@ -796,24 +795,16 @@ static int omap_dm_timer_probe(struct platform_device *pdev)  		return -ENODEV;  	} -	irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0); -	if (unlikely(!irq)) { -		dev_err(dev, "%s: no IRQ resource.\n", __func__); -		return -ENODEV; -	} - -	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); -	if (unlikely(!mem)) { -		dev_err(dev, "%s: no memory resource.\n", __func__); -		return -ENODEV; -	} -  	timer = devm_kzalloc(dev, sizeof(*timer), GFP_KERNEL);  	if (!timer)  		return  -ENOMEM; +	timer->irq = platform_get_irq(pdev, 0); +	if (timer->irq < 0) +		return timer->irq; +  	timer->fclk = ERR_PTR(-ENODEV); -	timer->io_base = devm_ioremap_resource(dev, mem); +	timer->io_base = devm_platform_ioremap_resource(pdev, 0);  	if (IS_ERR(timer->io_base))  		return PTR_ERR(timer->io_base); @@ -836,7 +827,6 @@ static int omap_dm_timer_probe(struct platform_device *pdev)  	if (pdata)  		timer->errata = pdata->timer_errata; -	timer->irq = irq->start;  	timer->pdev = pdev;  	pm_runtime_enable(dev);  |