Commit 9ac3e58c authored by Dominik Brodowski's avatar Dominik Brodowski

pcmcia: deprecate CS_CHECK (bluetooth)

Remove all usages of the CS_CHECK macro and replace them with proper
Linux style calling and return value checking. The extra error reporting may
be dropped, as the PCMCIA core already complains about any (non-driver-author)
errors.

CC: linux-bluetooth@vger.kernel.org
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 444486a5
...@@ -905,22 +905,16 @@ static int bluecard_config(struct pcmcia_device *link) ...@@ -905,22 +905,16 @@ static int bluecard_config(struct pcmcia_device *link)
break; break;
} }
if (i != 0) { if (i != 0)
cs_error(link, RequestIO, i);
goto failed; goto failed;
}
i = pcmcia_request_irq(link, &link->irq); i = pcmcia_request_irq(link, &link->irq);
if (i != 0) { if (i != 0)
cs_error(link, RequestIRQ, i);
link->irq.AssignedIRQ = 0; link->irq.AssignedIRQ = 0;
}
i = pcmcia_request_configuration(link, &link->conf); i = pcmcia_request_configuration(link, &link->conf);
if (i != 0) { if (i != 0)
cs_error(link, RequestConfiguration, i);
goto failed; goto failed;
}
if (bluecard_open(info) != 0) if (bluecard_open(info) != 0)
goto failed; goto failed;
......
...@@ -740,21 +740,16 @@ static int bt3c_config(struct pcmcia_device *link) ...@@ -740,21 +740,16 @@ static int bt3c_config(struct pcmcia_device *link)
goto found_port; goto found_port;
BT_ERR("No usable port range found"); BT_ERR("No usable port range found");
cs_error(link, RequestIO, -ENODEV);
goto failed; goto failed;
found_port: found_port:
i = pcmcia_request_irq(link, &link->irq); i = pcmcia_request_irq(link, &link->irq);
if (i != 0) { if (i != 0)
cs_error(link, RequestIRQ, i);
link->irq.AssignedIRQ = 0; link->irq.AssignedIRQ = 0;
}
i = pcmcia_request_configuration(link, &link->conf); i = pcmcia_request_configuration(link, &link->conf);
if (i != 0) { if (i != 0)
cs_error(link, RequestConfiguration, i);
goto failed; goto failed;
}
if (bt3c_open(info) != 0) if (bt3c_open(info) != 0)
goto failed; goto failed;
......
...@@ -669,21 +669,16 @@ static int btuart_config(struct pcmcia_device *link) ...@@ -669,21 +669,16 @@ static int btuart_config(struct pcmcia_device *link)
goto found_port; goto found_port;
BT_ERR("No usable port range found"); BT_ERR("No usable port range found");
cs_error(link, RequestIO, -ENODEV);
goto failed; goto failed;
found_port: found_port:
i = pcmcia_request_irq(link, &link->irq); i = pcmcia_request_irq(link, &link->irq);
if (i != 0) { if (i != 0)
cs_error(link, RequestIRQ, i);
link->irq.AssignedIRQ = 0; link->irq.AssignedIRQ = 0;
}
i = pcmcia_request_configuration(link, &link->conf); i = pcmcia_request_configuration(link, &link->conf);
if (i != 0) { if (i != 0)
cs_error(link, RequestConfiguration, i);
goto failed; goto failed;
}
if (btuart_open(info) != 0) if (btuart_open(info) != 0)
goto failed; goto failed;
......
...@@ -622,16 +622,12 @@ static int dtl1_config(struct pcmcia_device *link) ...@@ -622,16 +622,12 @@ static int dtl1_config(struct pcmcia_device *link)
goto failed; goto failed;
i = pcmcia_request_irq(link, &link->irq); i = pcmcia_request_irq(link, &link->irq);
if (i != 0) { if (i != 0)
cs_error(link, RequestIRQ, i);
link->irq.AssignedIRQ = 0; link->irq.AssignedIRQ = 0;
}
i = pcmcia_request_configuration(link, &link->conf); i = pcmcia_request_configuration(link, &link->conf);
if (i != 0) { if (i != 0)
cs_error(link, RequestConfiguration, i);
goto failed; goto failed;
}
if (dtl1_open(info) != 0) if (dtl1_open(info) != 0)
goto failed; goto failed;
......
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