net:mcf8390: Use platform_get_irq() to get the interrupt
[ Upstream commit 2a760554dc
]
It is not recommened to use platform_get_resource(pdev, IORESOURCE_IRQ)
for requesting IRQ's resources any more, as they can be not ready yet in
case of DT-booting.
platform_get_irq() instead is a recommended way for getting IRQ even if
it was not retrieved earlier.
It also makes code simpler because we're getting "int" value right away
and no conversion from resource to int is required.
Reported-by: Zeal Robot <zealci@zte.com.cn>
Signed-off-by: Minghao Chi (CGEL ZTE) <chi.minghao@zte.com.cn>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
526a46a5f4
commit
13b570f365
|
@ -406,12 +406,12 @@ static int mcf8390_init(struct net_device *dev)
|
|||
static int mcf8390_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct net_device *dev;
|
||||
struct resource *mem, *irq;
|
||||
struct resource *mem;
|
||||
resource_size_t msize;
|
||||
int ret;
|
||||
int ret, irq;
|
||||
|
||||
irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
|
||||
if (irq == NULL) {
|
||||
irq = platform_get_irq(pdev, 0);
|
||||
if (irq < 0) {
|
||||
dev_err(&pdev->dev, "no IRQ specified?\n");
|
||||
return -ENXIO;
|
||||
}
|
||||
|
@ -434,7 +434,7 @@ static int mcf8390_probe(struct platform_device *pdev)
|
|||
SET_NETDEV_DEV(dev, &pdev->dev);
|
||||
platform_set_drvdata(pdev, dev);
|
||||
|
||||
dev->irq = irq->start;
|
||||
dev->irq = irq;
|
||||
dev->base_addr = mem->start;
|
||||
|
||||
ret = mcf8390_init(dev);
|
||||
|
|
Loading…
Reference in New Issue