diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-20 12:09:46 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-20 12:09:46 -0400 |
commit | 54291263519ac2c9bdda68b23b02fef3808deed4 (patch) | |
tree | d71de8172a6ab2bbe3068aece7d8911eeeb276fd /drivers/bluetooth/bluecard_cs.c | |
parent | 46ee9645094ad1eb5b4888882ecaa1fb87dcd2a3 (diff) | |
parent | acd200bf45487271d54f05938ad9e30f32a530ee (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (29 commits)
pcmcia: disable PCMCIA ioctl also for ARM
drivers/staging/comedi: dev_node removal (quatech_daqp_cs)
drivers/staging/comedi: dev_node removal (ni_mio_cs)
drivers/staging/comedi: dev_node removal (ni_labpc_cs)
drivers/staging/comedi: dev_node removal (ni_daq_dio24)
drivers/staging/comedi: dev_node removal (ni_daq_700)
drivers/staging/comedi: dev_node removal (das08_cs)
drivers/staging/comedi: dev_node removal (cb_das16_cs)
pata_pcmcia: get rid of extra indirection
pcmcia: remove suspend-related comment from yenta_socket.c
pcmcia: call pcmcia_{read,write}_cis_mem with ops_mutex held
pcmcia: remove pcmcia_add_device_lock
pcmcia: update gfp/slab.h includes
pcmcia: remove unused mem_op.h
pcmcia: do not autoadd root PCI bus resources
pcmcia: clarify alloc_io_space, move it to resource handlers
pcmcia: move all pcmcia_resource_ops providers into one module
pcmcia: move high level CIS access code to separate file
pcmcia: dev_node removal (core)
pcmcia: dev_node removal (remaining drivers)
...
Diffstat (limited to 'drivers/bluetooth/bluecard_cs.c')
-rw-r--r-- | drivers/bluetooth/bluecard_cs.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c index d9bf87ca9e83..6f907ebed2d5 100644 --- a/drivers/bluetooth/bluecard_cs.c +++ b/drivers/bluetooth/bluecard_cs.c | |||
@@ -65,7 +65,6 @@ MODULE_LICENSE("GPL"); | |||
65 | 65 | ||
66 | typedef struct bluecard_info_t { | 66 | typedef struct bluecard_info_t { |
67 | struct pcmcia_device *p_dev; | 67 | struct pcmcia_device *p_dev; |
68 | dev_node_t node; | ||
69 | 68 | ||
70 | struct hci_dev *hdev; | 69 | struct hci_dev *hdev; |
71 | 70 | ||
@@ -869,9 +868,6 @@ static int bluecard_probe(struct pcmcia_device *link) | |||
869 | 868 | ||
870 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; | 869 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; |
871 | link->io.NumPorts1 = 8; | 870 | link->io.NumPorts1 = 8; |
872 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; | ||
873 | |||
874 | link->irq.Handler = bluecard_interrupt; | ||
875 | 871 | ||
876 | link->conf.Attributes = CONF_ENABLE_IRQ; | 872 | link->conf.Attributes = CONF_ENABLE_IRQ; |
877 | link->conf.IntType = INT_MEMORY_AND_IO; | 873 | link->conf.IntType = INT_MEMORY_AND_IO; |
@@ -908,9 +904,9 @@ static int bluecard_config(struct pcmcia_device *link) | |||
908 | if (i != 0) | 904 | if (i != 0) |
909 | goto failed; | 905 | goto failed; |
910 | 906 | ||
911 | i = pcmcia_request_irq(link, &link->irq); | 907 | i = pcmcia_request_irq(link, bluecard_interrupt); |
912 | if (i != 0) | 908 | if (i != 0) |
913 | link->irq.AssignedIRQ = 0; | 909 | goto failed; |
914 | 910 | ||
915 | i = pcmcia_request_configuration(link, &link->conf); | 911 | i = pcmcia_request_configuration(link, &link->conf); |
916 | if (i != 0) | 912 | if (i != 0) |
@@ -919,9 +915,6 @@ static int bluecard_config(struct pcmcia_device *link) | |||
919 | if (bluecard_open(info) != 0) | 915 | if (bluecard_open(info) != 0) |
920 | goto failed; | 916 | goto failed; |
921 | 917 | ||
922 | strcpy(info->node.dev_name, info->hdev->name); | ||
923 | link->dev_node = &info->node; | ||
924 | |||
925 | return 0; | 918 | return 0; |
926 | 919 | ||
927 | failed: | 920 | failed: |