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

Commit bf83c2a3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
  [PATCH] pcmcia: at91_cf update
  [PATCH] pcmcia: fix m32r_cfc.c compilation
  [PATCH] pcmcia: ds.c debug enhancements
  [PATCH] pcmcia: at91_cf update
  [PATCH] pcmcia: conf.ConfigBase and conf.Present consolidation
  [PATCH] pcmcia: remove prod_id indirection
  [PATCH] pcmcia: remove manf_id and card_id indirection
  [PATCH] pcmcia: IDs for Elan serial PCMCIA devcies
  [PATCH] pcmcia: allow for four multifunction subdevices
  [PATCH] pcmcia: handle __copy_from_user() return value in ioctl
  [PATCH] pcmcia: multifunction card handling fixes
  [PATCH] pcmcia: allow shared IRQs on pd6729 sockets
  [PATCH] pcmcia: start over after CIS override
  [PATCH] cm4000_cs: fix return value check
  [PATCH] pcmcia: yet another IDE ID
  [PATCH] pcmcia: Add an id to ide-cs.c
parents e6243863 40a0017e

drivers/ata/pata_pcmcia.c

+5 −10
Original line number Diff line number Diff line
@@ -154,19 +154,12 @@ static int pcmcia_init_one(struct pcmcia_device *pdev) 
	tuple.TupleOffset = 0;

	tuple.TupleDataMax = 255;

	tuple.Attributes = 0;

	tuple.DesiredTuple = CISTPL_CONFIG;



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

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

	CS_CHECK(ParseTuple, pcmcia_parse_tuple(pdev, &tuple, &stk->parse));

	pdev->conf.ConfigBase = stk->parse.config.base;

	pdev->conf.Present = stk->parse.config.rmask[0];



	/* See if we have a manufacturer identifier. Use it to set is_kme for

	   vendor quirks */

	tuple.DesiredTuple = CISTPL_MANFID;

	if (!pcmcia_get_first_tuple(pdev, &tuple) && !pcmcia_get_tuple_data(pdev, &tuple) && !pcmcia_parse_tuple(pdev, &tuple, &stk->parse))

			is_kme = ((stk->parse.manfid.manf == MANFID_KME) && ((stk->parse.manfid.card == PRODID_KME_KXLC005_A) || (stk->parse.manfid.card == PRODID_KME_KXLC005_B)));

	is_kme = ((pdev->manf_id == MANFID_KME) &&

		  ((pdev->card_id == PRODID_KME_KXLC005_A) ||

		   (pdev->card_id == PRODID_KME_KXLC005_B)));



	/* Not sure if this is right... look up the current Vcc */

	CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(pdev, &stk->conf));
@@ -356,8 +349,10 @@ static struct pcmcia_device_id pcmcia_devices[] = { 
	PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6),

	PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003),

	PCMCIA_DEVICE_PROD_ID1("TRANSCEND    512M   ", 0xd0909443),

	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF80", 0x709b1bf1, 0x2a54d4b1),

	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8),

	PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),

	PCMCIA_DEVICE_PROD_ID12("WEIDA", "TWTTI", 0xcc7cf69c, 0x212bb918),

	PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),

	PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e),

	PCMCIA_MFC_DEVICE_PROD_ID12(1, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6),

drivers/bluetooth/bluecard_cs.c

+1 −37
Original line number Diff line number Diff line
@@ -892,43 +892,10 @@ static void bluecard_detach(struct pcmcia_device *link) 
}





static int first_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)

{

	int i;



	i = pcmcia_get_first_tuple(handle, tuple);

	if (i != CS_SUCCESS)

		return CS_NO_MORE_ITEMS;



	i = pcmcia_get_tuple_data(handle, tuple);

	if (i != CS_SUCCESS)

		return i;



	return pcmcia_parse_tuple(handle, tuple, parse);

}



static int bluecard_config(struct pcmcia_device *link)

{

	bluecard_info_t *info = link->priv;

	tuple_t tuple;

	u_short buf[256];

	cisparse_t parse;

	int i, n, last_ret, last_fn;



	tuple.TupleData = (cisdata_t *)buf;

	tuple.TupleOffset = 0;

	tuple.TupleDataMax = 255;

	tuple.Attributes = 0;



	/* Get configuration register information */

	tuple.DesiredTuple = CISTPL_CONFIG;

	last_ret = first_tuple(link, &tuple, &parse);

	if (last_ret != CS_SUCCESS) {

		last_fn = ParseTuple;

		goto cs_failed;

	}

	link->conf.ConfigBase = parse.config.base;

	link->conf.Present = parse.config.rmask[0];

	int i, n;



	link->conf.ConfigIndex = 0x20;

	link->io.NumPorts1 = 64;
@@ -966,9 +933,6 @@ static int bluecard_config(struct pcmcia_device *link) 


	return 0;



cs_failed:

	cs_error(link, last_fn, last_ret);



failed:

	bluecard_release(link);

	return -ENODEV;

drivers/bluetooth/bt3c_cs.c

+1 −19
Original line number Diff line number Diff line
@@ -713,22 +713,7 @@ static int bt3c_config(struct pcmcia_device *link) 
	u_short buf[256];

	cisparse_t parse;

	cistpl_cftable_entry_t *cf = &parse.cftable_entry;

	int i, j, try, last_ret, last_fn;



	tuple.TupleData = (cisdata_t *)buf;

	tuple.TupleOffset = 0;

	tuple.TupleDataMax = 255;

	tuple.Attributes = 0;



	/* Get configuration register information */

	tuple.DesiredTuple = CISTPL_CONFIG;

	last_ret = first_tuple(link, &tuple, &parse);

	if (last_ret != CS_SUCCESS) {

		last_fn = ParseTuple;

		goto cs_failed;

	}

	link->conf.ConfigBase = parse.config.base;

	link->conf.Present = parse.config.rmask[0];

	int i, j, try;



	/* First pass: look for a config entry that looks normal. */

	tuple.TupleData = (cisdata_t *)buf;
@@ -802,9 +787,6 @@ static int bt3c_config(struct pcmcia_device *link) 


	return 0;



cs_failed:

	cs_error(link, last_fn, last_ret);



failed:

	bt3c_release(link);

	return -ENODEV;

drivers/bluetooth/btuart_cs.c

+1 −19
Original line number Diff line number Diff line
@@ -644,22 +644,7 @@ static int btuart_config(struct pcmcia_device *link) 
	u_short buf[256];

	cisparse_t parse;

	cistpl_cftable_entry_t *cf = &parse.cftable_entry;

	int i, j, try, last_ret, last_fn;



	tuple.TupleData = (cisdata_t *)buf;

	tuple.TupleOffset = 0;

	tuple.TupleDataMax = 255;

	tuple.Attributes = 0;



	/* Get configuration register information */

	tuple.DesiredTuple = CISTPL_CONFIG;

	last_ret = first_tuple(link, &tuple, &parse);

	if (last_ret != CS_SUCCESS) {

		last_fn = ParseTuple;

		goto cs_failed;

	}

	link->conf.ConfigBase = parse.config.base;

	link->conf.Present = parse.config.rmask[0];

	int i, j, try;



	/* First pass: look for a config entry that looks normal. */

	tuple.TupleData = (cisdata_t *) buf;
@@ -734,9 +719,6 @@ static int btuart_config(struct pcmcia_device *link) 


	return 0;



cs_failed:

	cs_error(link, last_fn, last_ret);



failed:

	btuart_release(link);

	return -ENODEV;

drivers/bluetooth/dtl1_cs.c

+1 −19
Original line number Diff line number Diff line
@@ -626,22 +626,7 @@ static int dtl1_config(struct pcmcia_device *link) 
	u_short buf[256];

	cisparse_t parse;

	cistpl_cftable_entry_t *cf = &parse.cftable_entry;

	int i, last_ret, last_fn;



	tuple.TupleData = (cisdata_t *)buf;

	tuple.TupleOffset = 0;

	tuple.TupleDataMax = 255;

	tuple.Attributes = 0;



	/* Get configuration register information */

	tuple.DesiredTuple = CISTPL_CONFIG;

	last_ret = first_tuple(link, &tuple, &parse);

	if (last_ret != CS_SUCCESS) {

		last_fn = ParseTuple;

		goto cs_failed;

	}

	link->conf.ConfigBase = parse.config.base;

	link->conf.Present = parse.config.rmask[0];

	int i;



	tuple.TupleData = (cisdata_t *)buf;

	tuple.TupleOffset = 0;
@@ -690,9 +675,6 @@ static int dtl1_config(struct pcmcia_device *link) 


	return 0;



cs_failed:

	cs_error(link, last_fn, last_ret);



failed:

	dtl1_release(link);

	return -ENODEV;