Commit 47873d33 authored by Marek Belisko's avatar Marek Belisko Committed by Greg Kroah-Hartman

staging: ft1000: correct indentations for ft1000_usb.c file.

Signed-off-by: default avatarMarek Belisko <marek.belisko@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 3d97ca7f
...@@ -22,7 +22,6 @@ MODULE_DESCRIPTION("FT1000 EXPRESS CARD DRIVER"); ...@@ -22,7 +22,6 @@ MODULE_DESCRIPTION("FT1000 EXPRESS CARD DRIVER");
MODULE_LICENSE("Dual MPL/GPL"); MODULE_LICENSE("Dual MPL/GPL");
MODULE_SUPPORTED_DEVICE("QFT FT1000 Express Cards"); MODULE_SUPPORTED_DEVICE("QFT FT1000 Express Cards");
void *pFileStart; void *pFileStart;
size_t FileLength; size_t FileLength;
...@@ -32,7 +31,7 @@ size_t FileLength; ...@@ -32,7 +31,7 @@ size_t FileLength;
/* table of devices that work with this driver */ /* table of devices that work with this driver */
static struct usb_device_id id_table[] = { static struct usb_device_id id_table[] = {
{USB_DEVICE(VENDOR_ID, PRODUCT_ID)}, {USB_DEVICE(VENDOR_ID, PRODUCT_ID)},
{ }, {},
}; };
MODULE_DEVICE_TABLE(usb, id_table); MODULE_DEVICE_TABLE(usb, id_table);
...@@ -68,7 +67,6 @@ static int ft1000_probe(struct usb_interface *interface, ...@@ -68,7 +67,6 @@ static int ft1000_probe(struct usb_interface *interface,
FT1000_INFO *pft1000info; FT1000_INFO *pft1000info;
const struct firmware *dsp_fw; const struct firmware *dsp_fw;
ft1000dev = kmalloc(sizeof(struct ft1000_device), GFP_KERNEL); ft1000dev = kmalloc(sizeof(struct ft1000_device), GFP_KERNEL);
if (!ft1000dev) { if (!ft1000dev) {
...@@ -90,7 +88,6 @@ static int ft1000_probe(struct usb_interface *interface, ...@@ -90,7 +88,6 @@ static int ft1000_probe(struct usb_interface *interface,
ft1000dev->tx_urb = usb_alloc_urb(0, GFP_ATOMIC); ft1000dev->tx_urb = usb_alloc_urb(0, GFP_ATOMIC);
ft1000dev->rx_urb = usb_alloc_urb(0, GFP_ATOMIC); ft1000dev->rx_urb = usb_alloc_urb(0, GFP_ATOMIC);
DEBUG("ft1000_probe is called\n"); DEBUG("ft1000_probe is called\n");
numaltsetting = interface->num_altsetting; numaltsetting = interface->num_altsetting;
DEBUG("ft1000_probe: number of alt settings is :%d\n", numaltsetting); DEBUG("ft1000_probe: number of alt settings is :%d\n", numaltsetting);
...@@ -115,8 +112,8 @@ static int ft1000_probe(struct usb_interface *interface, ...@@ -115,8 +112,8 @@ static int ft1000_probe(struct usb_interface *interface,
for (i = 0; i < iface_desc->desc.bNumEndpoints; i++) { for (i = 0; i < iface_desc->desc.bNumEndpoints; i++) {
endpoint = endpoint =
(struct usb_endpoint_descriptor *)&iface_desc->endpoint[i]. (struct usb_endpoint_descriptor *)&iface_desc->
desc; endpoint[i].desc;
DEBUG("endpoint %d\n", i); DEBUG("endpoint %d\n", i);
DEBUG("bEndpointAddress=%x, bmAttributes=%x\n", DEBUG("bEndpointAddress=%x, bmAttributes=%x\n",
endpoint->bEndpointAddress, endpoint->bmAttributes); endpoint->bEndpointAddress, endpoint->bmAttributes);
...@@ -188,7 +185,6 @@ static int ft1000_probe(struct usb_interface *interface, ...@@ -188,7 +185,6 @@ static int ft1000_probe(struct usb_interface *interface,
DEBUG("ft1000_probe::Waiting for Card Ready\n"); DEBUG("ft1000_probe::Waiting for Card Ready\n");
} }
DEBUG("ft1000_probe::Card Ready!!!! Registering network device\n"); DEBUG("ft1000_probe::Card Ready!!!! Registering network device\n");
reg_ft1000_netdev(ft1000dev, interface); reg_ft1000_netdev(ft1000dev, interface);
...@@ -212,15 +208,13 @@ static void ft1000_disconnect(struct usb_interface *interface) ...@@ -212,15 +208,13 @@ static void ft1000_disconnect(struct usb_interface *interface)
DEBUG("ft1000_disconnect is called\n"); DEBUG("ft1000_disconnect is called\n");
pft1000info = (PFT1000_INFO)usb_get_intfdata(interface); pft1000info = (PFT1000_INFO) usb_get_intfdata(interface);
DEBUG("In disconnect pft1000info=%p\n", pft1000info); DEBUG("In disconnect pft1000info=%p\n", pft1000info);
if (pft1000info) { if (pft1000info) {
ft1000CleanupProc(pft1000info); ft1000CleanupProc(pft1000info);
if (pft1000info->pPollThread) if (pft1000info->pPollThread)
kthread_stop(pft1000info->pPollThread ); kthread_stop(pft1000info->pPollThread);
DEBUG("ft1000_disconnect: threads are terminated\n"); DEBUG("ft1000_disconnect: threads are terminated\n");
...@@ -228,7 +222,8 @@ static void ft1000_disconnect(struct usb_interface *interface) ...@@ -228,7 +222,8 @@ static void ft1000_disconnect(struct usb_interface *interface)
DEBUG("ft1000_disconnect: destroy char driver\n"); DEBUG("ft1000_disconnect: destroy char driver\n");
ft1000_DestroyDevice(pft1000info->pFt1000Dev->net); ft1000_DestroyDevice(pft1000info->pFt1000Dev->net);
unregister_netdev(pft1000info->pFt1000Dev->net); unregister_netdev(pft1000info->pFt1000Dev->net);
DEBUG("ft1000_disconnect: network device unregisterd\n"); DEBUG
("ft1000_disconnect: network device unregisterd\n");
free_netdev(pft1000info->pFt1000Dev->net); free_netdev(pft1000info->pFt1000Dev->net);
} }
...@@ -271,7 +266,5 @@ static void __exit usb_ft1000_exit(void) ...@@ -271,7 +266,5 @@ static void __exit usb_ft1000_exit(void)
usb_deregister(&ft1000_usb_driver); usb_deregister(&ft1000_usb_driver);
} }
module_init (usb_ft1000_init); module_init(usb_ft1000_init);
module_exit (usb_ft1000_exit); module_exit(usb_ft1000_exit);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment