aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/uwb
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2010-12-16 13:05:06 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-12-16 13:05:06 -0500
commit36facadd9ea98f8415d0dbb63e0763b7ee9d3911 (patch)
tree99dea00b332ed852f2b0a4923b581dd723f03634 /drivers/uwb
parent2faa83e2a519abea1055d156ce1b42b8fa57e87b (diff)
parent0b83ae960cd7d4a5ee02786ecf41ab45688999bf (diff)
Merge branch 'usb-next' into musb-merge
* usb-next: (132 commits) USB: uas: Use GFP_NOIO instead of GFP_KERNEL in I/O submission path USB: uas: Ensure we only bind to a UAS interface USB: uas: Rename sense pipe and sense urb to status pipe and status urb USB: uas: Use kzalloc instead of kmalloc USB: uas: Fix up the Sense IU usb: musb: core: kill unneeded #include's DA8xx: assign name to MUSB IRQ resource usb: gadget: g_ncm added usb: gadget: f_ncm.c added usb: gadget: u_ether: prepare for NCM usb: pch_udc: Fix setup transfers with data out usb: pch_udc: Fix compile error, warnings and checkpatch warnings usb: add ab8500 usb transceiver driver USB: gadget: Implement runtime PM for MSM bus glue driver USB: gadget: Implement runtime PM for ci13xxx gadget USB: gadget: Add USB controller driver for MSM SoC USB: gadget: Introduce ci13xxx_udc_driver struct USB: gadget: Initialize ci13xxx gadget device's coherent DMA mask USB: gadget: Fix "scheduling while atomic" bugs in ci13xxx_udc USB: gadget: Separate out PCI bus code from ci13xxx_udc ...
Diffstat (limited to 'drivers/uwb')
-rw-r--r--drivers/uwb/i1480/i1480-est.c2
-rw-r--r--drivers/uwb/umc-dev.c7
-rw-r--r--drivers/uwb/whc-rc.c2
3 files changed, 4 insertions, 7 deletions
diff --git a/drivers/uwb/i1480/i1480-est.c b/drivers/uwb/i1480/i1480-est.c
index f2eb4d8b76c9..d5de5e131d47 100644
--- a/drivers/uwb/i1480/i1480-est.c
+++ b/drivers/uwb/i1480/i1480-est.c
@@ -91,7 +91,7 @@ MODULE_LICENSE("GPL");
91 * 91 *
92 * [so we are loaded when this kind device is connected] 92 * [so we are loaded when this kind device is connected]
93 */ 93 */
94static struct usb_device_id i1480_est_id_table[] = { 94static struct usb_device_id __used i1480_est_id_table[] = {
95 { USB_DEVICE(0x8086, 0xdf3b), }, 95 { USB_DEVICE(0x8086, 0xdf3b), },
96 { USB_DEVICE(0x8086, 0x0c3b), }, 96 { USB_DEVICE(0x8086, 0x0c3b), },
97 { }, 97 { },
diff --git a/drivers/uwb/umc-dev.c b/drivers/uwb/umc-dev.c
index 43ea9982e687..ccd2184e05d2 100644
--- a/drivers/uwb/umc-dev.c
+++ b/drivers/uwb/umc-dev.c
@@ -54,11 +54,8 @@ int umc_device_register(struct umc_dev *umc)
54 54
55 err = request_resource(umc->resource.parent, &umc->resource); 55 err = request_resource(umc->resource.parent, &umc->resource);
56 if (err < 0) { 56 if (err < 0) {
57 dev_err(&umc->dev, "can't allocate resource range " 57 dev_err(&umc->dev, "can't allocate resource range %pR: %d\n",
58 "%016Lx to %016Lx: %d\n", 58 &umc->resource, err);
59 (unsigned long long)umc->resource.start,
60 (unsigned long long)umc->resource.end,
61 err);
62 goto error_request_resource; 59 goto error_request_resource;
63 } 60 }
64 61
diff --git a/drivers/uwb/whc-rc.c b/drivers/uwb/whc-rc.c
index 73495583c444..70a004aa19db 100644
--- a/drivers/uwb/whc-rc.c
+++ b/drivers/uwb/whc-rc.c
@@ -449,7 +449,7 @@ static int whcrc_post_reset(struct umc_dev *umc)
449} 449}
450 450
451/* PCI device ID's that we handle [so it gets loaded] */ 451/* PCI device ID's that we handle [so it gets loaded] */
452static struct pci_device_id whcrc_id_table[] = { 452static struct pci_device_id __used whcrc_id_table[] = {
453 { PCI_DEVICE_CLASS(PCI_CLASS_WIRELESS_WHCI, ~0) }, 453 { PCI_DEVICE_CLASS(PCI_CLASS_WIRELESS_WHCI, ~0) },
454 { /* empty last entry */ } 454 { /* empty last entry */ }
455}; 455};