Commit 2ef4bb24 authored by Minghao Chi's avatar Minghao Chi Committed by Dominik Brodowski

pcmcia: Use platform_get_irq() to get the interrupt

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: default avatarZeal Robot <zealci@zte.com.cn>
Signed-off-by: default avatarMinghao Chi <chi.minghao@zte.com.cn>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 3928cf08
...@@ -327,10 +327,11 @@ static int bcm63xx_drv_pcmcia_probe(struct platform_device *pdev) ...@@ -327,10 +327,11 @@ static int bcm63xx_drv_pcmcia_probe(struct platform_device *pdev)
{ {
struct bcm63xx_pcmcia_socket *skt; struct bcm63xx_pcmcia_socket *skt;
struct pcmcia_socket *sock; struct pcmcia_socket *sock;
struct resource *res, *irq_res; struct resource *res;
unsigned int regmem_size = 0, iomem_size = 0; unsigned int regmem_size = 0, iomem_size = 0;
u32 val; u32 val;
int ret; int ret;
int irq;
skt = kzalloc(sizeof(*skt), GFP_KERNEL); skt = kzalloc(sizeof(*skt), GFP_KERNEL);
if (!skt) if (!skt)
...@@ -342,9 +343,9 @@ static int bcm63xx_drv_pcmcia_probe(struct platform_device *pdev) ...@@ -342,9 +343,9 @@ static int bcm63xx_drv_pcmcia_probe(struct platform_device *pdev)
/* make sure we have all resources we need */ /* make sure we have all resources we need */
skt->common_res = platform_get_resource(pdev, IORESOURCE_MEM, 1); skt->common_res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
skt->attr_res = platform_get_resource(pdev, IORESOURCE_MEM, 2); skt->attr_res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); irq = platform_get_irq(pdev, 0);
skt->pd = pdev->dev.platform_data; skt->pd = pdev->dev.platform_data;
if (!skt->common_res || !skt->attr_res || !irq_res || !skt->pd) { if (!skt->common_res || !skt->attr_res || (irq < 0) || !skt->pd) {
ret = -EINVAL; ret = -EINVAL;
goto err; goto err;
} }
...@@ -380,7 +381,7 @@ static int bcm63xx_drv_pcmcia_probe(struct platform_device *pdev) ...@@ -380,7 +381,7 @@ static int bcm63xx_drv_pcmcia_probe(struct platform_device *pdev)
sock->dev.parent = &pdev->dev; sock->dev.parent = &pdev->dev;
sock->features = SS_CAP_STATIC_MAP | SS_CAP_PCCARD; sock->features = SS_CAP_STATIC_MAP | SS_CAP_PCCARD;
sock->io_offset = (unsigned long)skt->io_base; sock->io_offset = (unsigned long)skt->io_base;
sock->pci_irq = irq_res->start; sock->pci_irq = irq;
#ifdef CONFIG_CARDBUS #ifdef CONFIG_CARDBUS
sock->cb_dev = bcm63xx_cb_dev; sock->cb_dev = bcm63xx_cb_dev;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment