Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/bluetooth/bluecard_cs.c

+3 −9
Original line number Diff line number Diff line
@@ -905,22 +905,16 @@ static int bluecard_config(struct pcmcia_device *link) 
			break;

	}



	if (i != 0) {

		cs_error(link, RequestIO, i);

	if (i != 0)

		goto failed;

	}



	i = pcmcia_request_irq(link, &link->irq);

	if (i != 0) {

		cs_error(link, RequestIRQ, i);

	if (i != 0)

		link->irq.AssignedIRQ = 0;

	}



	i = pcmcia_request_configuration(link, &link->conf);

	if (i != 0) {

		cs_error(link, RequestConfiguration, i);

	if (i != 0)

		goto failed;

	}



	if (bluecard_open(info) != 0)

		goto failed;

drivers/bluetooth/bt3c_cs.c

+2 −7
Original line number Diff line number Diff line
@@ -740,21 +740,16 @@ static int bt3c_config(struct pcmcia_device *link) 
		goto found_port;



	BT_ERR("No usable port range found");

	cs_error(link, RequestIO, -ENODEV);

	goto failed;



found_port:

	i = pcmcia_request_irq(link, &link->irq);

	if (i != 0) {

		cs_error(link, RequestIRQ, i);

	if (i != 0)

		link->irq.AssignedIRQ = 0;

	}



	i = pcmcia_request_configuration(link, &link->conf);

	if (i != 0) {

		cs_error(link, RequestConfiguration, i);

	if (i != 0)

		goto failed;

	}



	if (bt3c_open(info) != 0)

		goto failed;

drivers/bluetooth/btuart_cs.c

+2 −7
Original line number Diff line number Diff line
@@ -669,21 +669,16 @@ static int btuart_config(struct pcmcia_device *link) 
		goto found_port;



	BT_ERR("No usable port range found");

	cs_error(link, RequestIO, -ENODEV);

	goto failed;



found_port:

	i = pcmcia_request_irq(link, &link->irq);

	if (i != 0) {

		cs_error(link, RequestIRQ, i);

	if (i != 0)

		link->irq.AssignedIRQ = 0;

	}



	i = pcmcia_request_configuration(link, &link->conf);

	if (i != 0) {

		cs_error(link, RequestConfiguration, i);

	if (i != 0)

		goto failed;

	}



	if (btuart_open(info) != 0)

		goto failed;

drivers/bluetooth/dtl1_cs.c

+2 −6
Original line number Diff line number Diff line
@@ -622,16 +622,12 @@ static int dtl1_config(struct pcmcia_device *link) 
		goto failed;



	i = pcmcia_request_irq(link, &link->irq);

	if (i != 0) {

		cs_error(link, RequestIRQ, i);

	if (i != 0)

		link->irq.AssignedIRQ = 0;

	}



	i = pcmcia_request_configuration(link, &link->conf);

	if (i != 0) {

		cs_error(link, RequestConfiguration, i);

	if (i != 0)

		goto failed;

	}



	if (dtl1_open(info) != 0)

		goto failed;