mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-19 17:11:03 +00:00
staging: ft1000: various checkpatch.pl fixes.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
2a28f6cb74
commit
0f570d8c5e
1 changed files with 29 additions and 42 deletions
|
@ -41,14 +41,11 @@ int ft1000_poll_thread(void *arg)
|
|||
{
|
||||
int ret = STATUS_SUCCESS;
|
||||
|
||||
while(!kthread_should_stop() )
|
||||
{
|
||||
while (!kthread_should_stop()) {
|
||||
msleep(10);
|
||||
if ( ! gPollingfailed )
|
||||
{
|
||||
if (!gPollingfailed) {
|
||||
ret = ft1000_poll(arg);
|
||||
if ( ret != STATUS_SUCCESS )
|
||||
{
|
||||
if (ret != STATUS_SUCCESS) {
|
||||
DEBUG("ft1000_poll_thread: polling failed\n");
|
||||
gPollingfailed = TRUE;
|
||||
}
|
||||
|
@ -84,9 +81,10 @@ static int ft1000_probe(struct usb_interface *interface, const struct usb_device
|
|||
const struct firmware *dsp_fw;
|
||||
|
||||
|
||||
if(!(ft1000dev = kmalloc(sizeof(struct ft1000_device), GFP_KERNEL)))
|
||||
{
|
||||
printk("out of memory allocating device structure\n");
|
||||
ft1000dev = kmalloc(sizeof(struct ft1000_device), GFP_KERNEL);
|
||||
|
||||
if (!ft1000dev) {
|
||||
printk(KERN_ERR "out of memory allocating device structure\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -118,19 +116,16 @@ static int ft1000_probe(struct usb_interface *interface, const struct usb_device
|
|||
DEBUG("ft1000_probe: descriptor1 type -- %d\n", iface_desc->endpoint[1].desc.bmAttributes);
|
||||
DEBUG("ft1000_probe: descriptor2 type -- %d\n", iface_desc->endpoint[2].desc.bmAttributes);
|
||||
|
||||
for (i=0; i< iface_desc->desc.bNumEndpoints;i++ )
|
||||
{
|
||||
for (i = 0; i < iface_desc->desc.bNumEndpoints; i++) {
|
||||
endpoint = (struct usb_endpoint_descriptor *)&iface_desc->endpoint[i].desc;
|
||||
DEBUG("endpoint %d\n", i);
|
||||
DEBUG("bEndpointAddress=%x, bmAttributes=%x\n", endpoint->bEndpointAddress, endpoint->bmAttributes);
|
||||
if ( (endpoint->bEndpointAddress & USB_DIR_IN) && ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_BULK))
|
||||
{
|
||||
if ((endpoint->bEndpointAddress & USB_DIR_IN) && ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_BULK)) {
|
||||
ft1000dev->bulk_in_endpointAddr = endpoint->bEndpointAddress;
|
||||
DEBUG("ft1000_probe: in: %d\n", endpoint->bEndpointAddress);
|
||||
}
|
||||
|
||||
if (!(endpoint->bEndpointAddress & USB_DIR_IN) && ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_BULK))
|
||||
{
|
||||
if (!(endpoint->bEndpointAddress & USB_DIR_IN) && ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_BULK)) {
|
||||
ft1000dev->bulk_out_endpointAddr = endpoint->bEndpointAddress;
|
||||
DEBUG("ft1000_probe: out: %d\n", endpoint->bEndpointAddress);
|
||||
}
|
||||
|
@ -172,14 +167,10 @@ static int ft1000_probe(struct usb_interface *interface, const struct usb_device
|
|||
pft1000info->pPollThread = kthread_run(ft1000_poll_thread, ft1000dev, "ft1000_poll");
|
||||
msleep(500);
|
||||
|
||||
while (!pft1000info->CardReady)
|
||||
{
|
||||
if ( gPollingfailed )
|
||||
{
|
||||
while (!pft1000info->CardReady) {
|
||||
if (gPollingfailed) {
|
||||
if (pft1000info->pPollThread)
|
||||
{
|
||||
kthread_stop(pft1000info->pPollThread);
|
||||
}
|
||||
ret = -EIO;
|
||||
goto err_load;
|
||||
}
|
||||
|
@ -228,18 +219,14 @@ static void ft1000_disconnect(struct usb_interface *interface)
|
|||
|
||||
|
||||
|
||||
if (pft1000info)
|
||||
{
|
||||
if (pft1000info) {
|
||||
ft1000CleanupProc(pft1000info);
|
||||
if (pft1000info->pPollThread)
|
||||
{
|
||||
kthread_stop(pft1000info->pPollThread );
|
||||
}
|
||||
|
||||
DEBUG("ft1000_disconnect: threads are terminated\n");
|
||||
|
||||
if (pft1000info->pFt1000Dev->net)
|
||||
{
|
||||
if (pft1000info->pFt1000Dev->net) {
|
||||
DEBUG("ft1000_disconnect: destroy char driver\n");
|
||||
ft1000_DestroyDevice(pft1000info->pFt1000Dev->net);
|
||||
unregister_netdev(pft1000info->pFt1000Dev->net);
|
||||
|
|
Loading…
Reference in a new issue