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

Commit 2f3061eb authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

pcmcia: remove unused argument to pcmcia_parse_tuple() 



Since we're just parsing the tuple being passed to this function, we don't
need any device-specific information.

Also, remove the call to pcmcia_validate_cis() from pcmciamtd.c, since it
is already called by the PCMCIA core.

Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 994917f8

drivers/char/pcmcia/ipwireless/main.c

+3 −3
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static int config_ipwireless(struct ipw_dev *ipw) 
		goto exit0;

	}



	ret = pcmcia_parse_tuple(link, &tuple, &parse);

	ret = pcmcia_parse_tuple(&tuple, &parse);



	if (ret != 0) {

		cs_error(link, ParseTuple, ret);
@@ -163,7 +163,7 @@ static int config_ipwireless(struct ipw_dev *ipw) 
		goto exit0;

	}



	ret = pcmcia_parse_tuple(link, &tuple, &parse);

	ret = pcmcia_parse_tuple(&tuple, &parse);



	if (ret != 0) {

		cs_error(link, GetTupleData, ret);
@@ -206,7 +206,7 @@ static int config_ipwireless(struct ipw_dev *ipw) 
		goto exit1;

	}



	ret = pcmcia_parse_tuple(link, &tuple, &parse);

	ret = pcmcia_parse_tuple(&tuple, &parse);



	if (ret != 0) {

		cs_error(link, ParseTuple, ret);

drivers/char/pcmcia/synclink_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -604,7 +604,7 @@ static int mgslpc_config(struct pcmcia_device *link) 


    cfg = &(parse.cftable_entry);

    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));

    CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));

    CS_CHECK(ParseTuple, pcmcia_parse_tuple(&tuple, &parse));



    if (cfg->flags & CISTPL_CFTABLE_DEFAULT) dflt = *cfg;

    if (cfg->index == 0)

drivers/mtd/maps/pcmciamtd.c

+1 −6
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ static void card_settings(struct pcmciamtd_dev *dev, struct pcmcia_device *link, 
			cs_error(link, GetTupleData, rc);

			break;

		}

		rc = pcmcia_parse_tuple(link, &tuple, &parse);

		rc = pcmcia_parse_tuple(&tuple, &parse);

		if (rc != 0) {

			cs_error(link, ParseTuple, rc);

			break;
@@ -498,11 +498,6 @@ static int pcmciamtd_config(struct pcmcia_device *link) 


	DEBUG(3, "link=0x%p", link);



	DEBUG(2, "Validating CIS");

	ret = pcmcia_validate_cis(link, NULL);

	if (ret != 0)

		cs_error(link, GetTupleData, ret);



	card_settings(dev, link, &new_name);



	dev->pcmcia_map.phys = NO_XIP;

drivers/net/pcmcia/fmvj18x_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ static int fmvj18x_config(struct pcmcia_device *link) 
	tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;

	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));

	CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));

	CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));

	CS_CHECK(ParseTuple, pcmcia_parse_tuple(&tuple, &parse));

	link->conf.ConfigIndex = parse.cftable_entry.index;

	switch (link->manf_id) {

	case MANFID_TDK:

drivers/net/pcmcia/smc91c92_cs.c

+2 −2
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ static int first_tuple(struct pcmcia_device *handle, tuple_t *tuple, 
	i = pcmcia_get_tuple_data(handle, tuple);

	if (i != 0)

		return i;

	return pcmcia_parse_tuple(handle, tuple, parse);

	return pcmcia_parse_tuple(tuple, parse);

}



static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple,
@@ -426,7 +426,7 @@ static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple, 
	if ((i = pcmcia_get_next_tuple(handle, tuple)) != 0 ||

			(i = pcmcia_get_tuple_data(handle, tuple)) != 0)

		return i;

	return pcmcia_parse_tuple(handle, tuple, parse);

	return pcmcia_parse_tuple(tuple, parse);

}



/*======================================================================