From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932077AbbFRN5i (ORCPT ); Thu, 18 Jun 2015 09:57:38 -0400 Received: from vsp-authed02.binero.net ([195.74.38.226]:55434 "EHLO bin-vsp-out-05.atm.binero.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752262AbbFRN5a (ORCPT ); Thu, 18 Jun 2015 09:57:30 -0400 X-Greylist: delayed 365 seconds by postgrey-1.27 at vger.kernel.org; Thu, 18 Jun 2015 09:57:29 EDT X-Halon-ID: 1aa25cf5-15c1-11e5-8d12-005056916f53 Authorized-sender: peter@zapto.se From: Peter Karlsson To: greg@kroah.com Cc: marek.belisko@gmail.com, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Peter Karlsson Subject: [PATCH 1/5] staging: ft1000-usb: Fixed some issues with lines over 80 characters Date: Thu, 18 Jun 2015 15:50:57 +0200 Message-Id: <1434635461-24643-2-git-send-email-peter@zapto.se> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1434635461-24643-1-git-send-email-peter@zapto.se> References: <1434635461-24643-1-git-send-email-peter@zapto.se> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix checkpatch warnings about lines over 80 characters. Signed-off-by: Peter Karlsson --- drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 55 +++++++++++++++--------- 1 file changed, 35 insertions(+), 20 deletions(-) diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c b/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c index faac4e5..5abafdc 100644 --- a/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c @@ -6,12 +6,12 @@ * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) any - * later version. This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. You should have received a copy of the GNU General Public - * License along with this program; if not, write to the + * Software Foundation; either version 2 of the License, or (at your option) + * any later version. This program is distributed in the hope that it will be + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General + * Public License for more details. You should have received a copy of the GNU + * General Public License along with this program; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - * Suite 330, Boston, MA 02111-1307, USA. *--------------------------------------------------------------------------- @@ -103,9 +103,6 @@ struct dpram_blk *ft1000_get_buffer(struct list_head *bufflist) return ptr; } - - - /* *--------------------------------------------------------------------------- * Function: ft1000_free_buffer @@ -260,7 +257,9 @@ void ft1000_destroy_dev(struct net_device *netdev) /* Make sure we free any memory reserve for slow Queue */ for (i = 0; i < MAX_NUM_APP; i++) { while (list_empty(&dev->app_info[i].app_sqlist) == 0) { - pdpram_blk = list_entry(dev->app_info[i].app_sqlist.next, struct dpram_blk, list); + pdpram_blk = list_entry( + dev->app_info[i].app_sqlist.next, + struct dpram_blk, list); list_del(&pdpram_blk->list); ft1000_free_buffer(pdpram_blk, &freercvpool); @@ -271,7 +270,8 @@ void ft1000_destroy_dev(struct net_device *netdev) /* Remove buffer allocated for receive command data */ if (ft1000_flarion_cnt == 0) { while (list_empty(&freercvpool) == 0) { - ptr = list_entry(freercvpool.next, struct dpram_blk, list); + ptr = list_entry(freercvpool.next, + struct dpram_blk, list); list_del(&ptr->list); kfree(ptr->pbuffer); kfree(ptr); @@ -414,12 +414,20 @@ static long ft1000_ioctl(struct file *file, unsigned int command, unsigned long flags; struct IOCTL_GET_VER get_ver_data; struct IOCTL_GET_DSP_STAT get_stat_data; - u8 ConnectionMsg[] = {0x00, 0x44, 0x10, 0x20, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x93, 0x64, - 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x0a, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x02, 0x37, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x7f, 0x00, - 0x00, 0x01, 0x00, 0x00}; + u8 ConnectionMsg[] = { + 0x00, 0x44, 0x10, 0x20, 0x80, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x93, 0x64, 0x00, 0x00, 0x02, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, + 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x02, 0x37, 0x00, 0x00, + 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0x00, + 0x01, 0x7f, 0x00, 0x00, 0x01, 0x00, 0x00 + }; unsigned short ledStat = 0; unsigned short conStat = 0; @@ -494,10 +502,16 @@ static long ft1000_ioctl(struct file *file, unsigned int command, memcpy(get_stat_data.eui64, info->eui64, EUISZ); if (info->ProgConStat != 0xFF) { - ft1000_read_dpram16(ft1000dev, FT1000_MAG_DSP_LED, (u8 *)&ledStat, FT1000_MAG_DSP_LED_INDX); + ft1000_read_dpram16(ft1000dev, + FT1000_MAG_DSP_LED, + (u8 *)&ledStat, + FT1000_MAG_DSP_LED_INDX); get_stat_data.LedStat = ntohs(ledStat); pr_debug("LedStat = 0x%x\n", get_stat_data.LedStat); - ft1000_read_dpram16(ft1000dev, FT1000_MAG_DSP_CON_STATE, (u8 *)&conStat, FT1000_MAG_DSP_CON_STATE_INDX); + ft1000_read_dpram16(ft1000dev, + FT1000_MAG_DSP_CON_STATE, + (u8 *)&conStat, + FT1000_MAG_DSP_CON_STATE_INDX); get_stat_data.ConStat = ntohs(conStat); pr_debug("ConStat = 0x%x\n", get_stat_data.ConStat); } else { @@ -687,7 +701,8 @@ static long ft1000_ioctl(struct file *file, unsigned int command, if (list_empty(&ft1000dev->app_info[i].app_sqlist) == 0) { /* pr_debug("Message detected in slow queue\n"); */ spin_lock_irqsave(&free_buff_lock, flags); - pdpram_blk = list_entry(ft1000dev->app_info[i].app_sqlist.next, struct dpram_blk, list); + pdpram_blk = list_entry(ft1000dev->app_info[i].app_sqlist.next, + struct dpram_blk, list); list_del(&pdpram_blk->list); ft1000dev->app_info[i].NumOfMsg--; /* pr_debug("NumOfMsg for app %d = %d\n", i, ft1000dev->app_info[i].NumOfMsg); */ -- 1.9.1