staging: ft1000: generic neatening

PATCH Superseded Joe Perches 2 participants 9 messages Nov 1, 2014 – Nov 4, 2014 Staging

lore

Share & tools

lore

Joe Perches

author

2014-11-01 23:53 UTC #0 lore raw

cover staging: ft1000: generic neatening

Joe Perches (2):
staging: ft1000: Whitespace neatening
staging: ft1000: Logging message neatening

 drivers/staging/ft1000/ft1000-pcmcia/boot.h        |   34 +-
 drivers/staging/ft1000/ft1000-pcmcia/ft1000.h      |   30 +-
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c   |   50 +-
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c |  208 ++--
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c   |  896 +++++++--------
 drivers/staging/ft1000/ft1000-usb/ft1000_debug.c   | 1198 ++++++++++----------
 .../staging/ft1000/ft1000-usb/ft1000_download.c    |  394 +++----
 drivers/staging/ft1000/ft1000-usb/ft1000_hw.c      |  436 ++++---
 drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h   |   60 +-
 drivers/staging/ft1000/ft1000-usb/ft1000_usb.c     |   97 +-
 drivers/staging/ft1000/ft1000-usb/ft1000_usb.h     |    4 +-
 11 files changed, 1636 insertions(+), 1771 deletions(-)

Signature · 1 line

2.1.2

Joe Perches

author

2014-11-01 23:54 UTC #1 lore raw

PATCH 1/2 staging: ft1000: Whitespace neatening

Use normal kernel style, indentation and alignment.

git diff -w shows no difference

Signed-off-by Joe Perches <[email protected]>

---
 drivers/staging/ft1000/ft1000-pcmcia/boot.h        |   34 +-
 drivers/staging/ft1000/ft1000-pcmcia/ft1000.h      |   30 +-
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c   |   50 +-
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c |  204 ++--
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c   |  688 +++++------
 drivers/staging/ft1000/ft1000-usb/ft1000_debug.c   | 1190 ++++++++++----------
 .../staging/ft1000/ft1000-usb/ft1000_download.c    |  300 ++---
 drivers/staging/ft1000/ft1000-usb/ft1000_hw.c      |  244 ++--
 drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h   |   60 +-
 drivers/staging/ft1000/ft1000-usb/ft1000_usb.c     |   14 +-
 drivers/staging/ft1000/ft1000-usb/ft1000_usb.h     |    2 +-
 11 files changed, 1408 insertions(+), 1408 deletions(-)

drivers/staging/ft1000/ft1000-pcmcia/boot.h +17 ~~-17~~

index 60c015c..e4a6985 100644
@@ -1,28 +1,28 @@
 /*---------------------------------------------------------------------------
-   FT1000 driver for Flarion Flash OFDM NIC Device
+  FT1000 driver for Flarion Flash OFDM NIC Device
 
-   Copyright (C) 2002 Flarion Technologies, All rights reserved.
+  Copyright (C) 2002 Flarion Technologies, All rights reserved.
 
-   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
-   Free Software Foundation, Inc., 59 Temple Place -
-   Suite 330, Boston, MA 02111-1307, USA.
+  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
+  Free Software Foundation, Inc., 59 Temple Place -
+  Suite 330, Boston, MA 02111-1307, USA.
   ---------------------------------------------------------------------------
 
-   File:         boot.h
+  File:         boot.h
 
-   Description:    boatloader
+  Description:    boatloader
 
-   History:
-   1/11/05    Whc                Ported to Linux.
+  History:
+  1/11/05    Whc                Ported to Linux.
 
----------------------------------------------------------------------------*/
+  ---------------------------------------------------------------------------*/
 #ifndef _BOOTH_
 #define _BOOTH_

drivers/staging/ft1000/ft1000-pcmcia/ft1000.h +15 ~~-15~~

index 1d52738..5992670 100644
@@ -1,21 +1,21 @@
 /*---------------------------------------------------------------------------
-   FT1000 driver for Flarion Flash OFDM NIC Device
+  FT1000 driver for Flarion Flash OFDM NIC Device
 
-   Copyright (C) 2002 Flarion Technologies, All rights reserved.
+  Copyright (C) 2002 Flarion Technologies, All rights reserved.
 
-   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
-   Free Software Foundation, Inc., 59 Temple Place -
-   Suite 330, Boston, MA 02111-1307, USA.
----------------------------------------------------------------------------
-   Description:    Common structures and defines
----------------------------------------------------------------------------*/
+  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
+  Free Software Foundation, Inc., 59 Temple Place -
+  Suite 330, Boston, MA 02111-1307, USA.
+  ---------------------------------------------------------------------------
+  Description:    Common structures and defines
+  ---------------------------------------------------------------------------*/
 #ifndef _FT1000H_
 #define _FT1000H_

drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c +25 ~~-25~~

66 lines not on this page · raw message

drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c +102 ~~-102~~

450 lines not on this page · raw message

drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c +344 ~~-344~~

1,288 lines not on this page · raw message

drivers/staging/ft1000/ft1000-usb/ft1000_debug.c +595 ~~-595~~

1,115 lines not on this page · raw message

drivers/staging/ft1000/ft1000-usb/ft1000_download.c +150 ~~-150~~

300 lines not on this page · raw message

drivers/staging/ft1000/ft1000-usb/ft1000_hw.c +122 ~~-122~~

244 lines not on this page · raw message

drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h +30 ~~-30~~

60 lines not on this page · raw message

drivers/staging/ft1000/ft1000-usb/ft1000_usb.c +7 -7

index 39be30c..244e3d6 100644

Lines of this file are not shown. View the raw message.

drivers/staging/ft1000/ft1000-usb/ft1000_usb.h +1 -1

index 8f7ccae..418e6df 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line

2.1.2

Part of the diff is not shown here. View the raw message.

Joe Perches

author

2014-11-01 23:54 UTC #8 lore raw

PATCH 2/2 staging: ft1000: Logging message neatening

In reply to Joe Perches

Use a more common logging style.

o Convert DEBUG macros to pr_debug
o Add pr_fmt
o Remove embedded function names from pr_debug
o Convert printks to pr_<level>
o Coalesce formats and align arguments
o Add missing terminating newlines

Signed-off-by Joe Perches <[email protected]>

---
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c |   6 +-
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c   | 340 ++++++++-------------
 drivers/staging/ft1000/ft1000-usb/ft1000_debug.c   | 136 ++++-----
 .../staging/ft1000/ft1000-usb/ft1000_download.c    | 138 ++++-----
 drivers/staging/ft1000/ft1000-usb/ft1000_hw.c      | 194 +++++-------
 drivers/staging/ft1000/ft1000-usb/ft1000_usb.c     |  85 +++---
 drivers/staging/ft1000/ft1000-usb/ft1000_usb.h     |   2 -
 7 files changed, 383 insertions(+), 518 deletions(-)

drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c +4 -2

index deb1256..1150050 100644
@@ -20,6 +20,8 @@
 
   ---------------------------------------------------------------------------*/
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #define __KERNEL_SYSCALLS__
 
 #include <linux/module.h>

@@ -316,7 +318,7 @@ int card_download(struct net_device *dev, const u8 *pFileStart,
 
 	file_version = *(long *)pFileStart;
 	if (file_version != 6) {
-		printk(KERN_ERR "ft1000: unsupported firmware version %ld\n", file_version);
+		pr_err("unsupported firmware version %ld\n", file_version);
 		Status = FAILURE;
 	}

@@ -688,7 +690,7 @@ int card_download(struct net_device *dev, const u8 *pFileStart,
 				uiState = STATE_SECTION_PROV;
 			} else {
 				netdev_dbg(dev,
-					   "FT1000:download:Download error: Bad Port IDs in Pseudo Record\n");
+					   "Download error: Bad Port IDs in Pseudo Record\n");
 				netdev_dbg(dev, "\t Port Source = 0x%2.2x\n",
 					   pHdr->portsrc);
 				netdev_dbg(dev, "\t Port Destination = 0x%2.2x\n",

drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c +131 ~~-209~~

928 lines not on this page · raw message

drivers/staging/ft1000/ft1000-usb/ft1000_debug.c +65 ~~-71~~

446 lines not on this page · raw message

drivers/staging/ft1000/ft1000-usb/ft1000_download.c +59 ~~-79~~

404 lines not on this page · raw message

drivers/staging/ft1000/ft1000-usb/ft1000_hw.c +84 ~~-110~~

627 lines not on this page · raw message

drivers/staging/ft1000/ft1000-usb/ft1000_usb.c +40 ~~-45~~

176 lines not on this page · raw message

drivers/staging/ft1000/ft1000-usb/ft1000_usb.h +0 -2

index 418e6df..fea60d5 100644
@@ -28,8 +28,6 @@ struct app_info_block {
 					*/
 } __packed;
 
-#define DEBUG(args...) pr_info(args)
-
 #define FALSE           0
 #define TRUE            1

Signature · 1 line

2.1.2

Greg Kroah-Hartman

maintainer

2014-11-04 00:06 UTC #2 lore raw

Re: [PATCH 1/2] staging: ft1000: Whitespace neatening

In reply to Joe Perches

Quoted 5 lines · Joe Perches

Use normal kernel style, indentation and alignment.
git diff -w shows no difference
Signed-off-by Joe Perches <[email protected]>

Quoted 13 lines

---
 drivers/staging/ft1000/ft1000-pcmcia/boot.h        |   34 +-
 drivers/staging/ft1000/ft1000-pcmcia/ft1000.h      |   30 +-
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c   |   50 +-
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c |  204 ++--
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c   |  688 +++++------
 drivers/staging/ft1000/ft1000-usb/ft1000_debug.c   | 1190 ++++++++++----------
 .../staging/ft1000/ft1000-usb/ft1000_download.c    |  300 ++---
 drivers/staging/ft1000/ft1000-usb/ft1000_hw.c      |  244 ++--
 drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h   |   60 +-
 drivers/staging/ft1000/ft1000-usb/ft1000_usb.c     |   14 +-
 drivers/staging/ft1000/ft1000-usb/ft1000_usb.h     |    2 +-
 11 files changed, 1408 insertions(+), 1408 deletions(-)

Fails to apply here:

checking file drivers/staging/ft1000/ft1000-pcmcia/boot.h checking file drivers/staging/ft1000/ft1000-pcmcia/ft1000.h checking file drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c checking file drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c checking file drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c Hunk #41 FAILED at 992.
Hunk #49 FAILED at 1220.
Hunk #64 FAILED at 1743.
3 out of 78 hunks FAILED

Care to refresh it and resend both of these?

thanks,

greg k-h

Joe Perches

author

2014-11-04 00:25 UTC #3 lore raw

v2 cover staging: ft1000: generic neatening

Joe Perches (2):
staging: ft1000: Whitespace neatening
ASoC: staging: ft1000: Logging message neatening

 drivers/staging/ft1000/ft1000-pcmcia/boot.h        |   34 +-
 drivers/staging/ft1000/ft1000-pcmcia/ft1000.h      |   30 +-
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c   |   50 +-
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c |  208 ++--
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c   |  894 +++++++--------
 drivers/staging/ft1000/ft1000-usb/ft1000_debug.c   | 1198 ++++++++++----------
 .../staging/ft1000/ft1000-usb/ft1000_download.c    |  394 +++----
 drivers/staging/ft1000/ft1000-usb/ft1000_hw.c      |  436 ++++---
 drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h   |   60 +-
 drivers/staging/ft1000/ft1000-usb/ft1000_usb.c     |   97 +-
 drivers/staging/ft1000/ft1000-usb/ft1000_usb.h     |    4 +-
 11 files changed, 1635 insertions(+), 1770 deletions(-)

Signature · 1 line

2.1.2

Joe Perches

author

2014-11-04 00:26 UTC #4 lore raw

PATCH v2 1/2 staging: ft1000: Whitespace neatening

In reply to Greg Kroah-Hartman

Use normal kernel style, indentation and alignment.

git diff -w shows no difference

Signed-off-by Joe Perches <[email protected]>

---
 drivers/staging/ft1000/ft1000-pcmcia/boot.h        |   34 +-
 drivers/staging/ft1000/ft1000-pcmcia/ft1000.h      |   30 +-
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c   |   50 +-
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c |  204 ++--
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c   |  686 +++++------
 drivers/staging/ft1000/ft1000-usb/ft1000_debug.c   | 1190 ++++++++++----------
 .../staging/ft1000/ft1000-usb/ft1000_download.c    |  300 ++---
 drivers/staging/ft1000/ft1000-usb/ft1000_hw.c      |  244 ++--
 drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h   |   60 +-
 drivers/staging/ft1000/ft1000-usb/ft1000_usb.c     |   14 +-
 drivers/staging/ft1000/ft1000-usb/ft1000_usb.h     |    2 +-
 11 files changed, 1407 insertions(+), 1407 deletions(-)

drivers/staging/ft1000/ft1000-pcmcia/boot.h +17 ~~-17~~

index 60c015c..e4a6985 100644
@@ -1,28 +1,28 @@
 /*---------------------------------------------------------------------------
-   FT1000 driver for Flarion Flash OFDM NIC Device
+  FT1000 driver for Flarion Flash OFDM NIC Device
 
-   Copyright (C) 2002 Flarion Technologies, All rights reserved.
+  Copyright (C) 2002 Flarion Technologies, All rights reserved.
 
-   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
-   Free Software Foundation, Inc., 59 Temple Place -
-   Suite 330, Boston, MA 02111-1307, USA.
+  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
+  Free Software Foundation, Inc., 59 Temple Place -
+  Suite 330, Boston, MA 02111-1307, USA.
   ---------------------------------------------------------------------------
 
-   File:         boot.h
+  File:         boot.h
 
-   Description:    boatloader
+  Description:    boatloader
 
-   History:
-   1/11/05    Whc                Ported to Linux.
+  History:
+  1/11/05    Whc                Ported to Linux.
 
----------------------------------------------------------------------------*/
+  ---------------------------------------------------------------------------*/
 #ifndef _BOOTH_
 #define _BOOTH_

drivers/staging/ft1000/ft1000-pcmcia/ft1000.h +15 ~~-15~~

index 1d52738..5992670 100644
@@ -1,21 +1,21 @@
 /*---------------------------------------------------------------------------
-   FT1000 driver for Flarion Flash OFDM NIC Device
+  FT1000 driver for Flarion Flash OFDM NIC Device
 
-   Copyright (C) 2002 Flarion Technologies, All rights reserved.
+  Copyright (C) 2002 Flarion Technologies, All rights reserved.
 
-   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
-   Free Software Foundation, Inc., 59 Temple Place -
-   Suite 330, Boston, MA 02111-1307, USA.
----------------------------------------------------------------------------
-   Description:    Common structures and defines
----------------------------------------------------------------------------*/
+  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
+  Free Software Foundation, Inc., 59 Temple Place -
+  Suite 330, Boston, MA 02111-1307, USA.
+  ---------------------------------------------------------------------------
+  Description:    Common structures and defines
+  ---------------------------------------------------------------------------*/
 #ifndef _FT1000H_
 #define _FT1000H_

drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c +25 ~~-25~~

66 lines not on this page · raw message

drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c +102 ~~-102~~

450 lines not on this page · raw message

drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c +343 ~~-343~~

1,284 lines not on this page · raw message

drivers/staging/ft1000/ft1000-usb/ft1000_debug.c +595 ~~-595~~

1,119 lines not on this page · raw message

drivers/staging/ft1000/ft1000-usb/ft1000_download.c +150 ~~-150~~

300 lines not on this page · raw message

drivers/staging/ft1000/ft1000-usb/ft1000_hw.c +122 ~~-122~~

244 lines not on this page · raw message

drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h +30 ~~-30~~

60 lines not on this page · raw message

drivers/staging/ft1000/ft1000-usb/ft1000_usb.c +7 -7

index 39be30c..244e3d6 100644

Lines of this file are not shown. View the raw message.

drivers/staging/ft1000/ft1000-usb/ft1000_usb.h +1 -1

index 8f7ccae..418e6df 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line

2.1.2

Part of the diff is not shown here. View the raw message.

Joe Perches

author

2014-11-04 00:26 UTC #5 lore raw

PATCH v2 2/2 ASoC: staging: ft1000: Logging message neatening

In reply to Greg Kroah-Hartman

Use a more common logging style.

Signed-off-by Joe Perches <[email protected]>

---
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c |   6 +-
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c   | 340 ++++++++-------------
 drivers/staging/ft1000/ft1000-usb/ft1000_debug.c   | 136 ++++-----
 .../staging/ft1000/ft1000-usb/ft1000_download.c    | 138 ++++-----
 drivers/staging/ft1000/ft1000-usb/ft1000_hw.c      | 194 +++++-------
 drivers/staging/ft1000/ft1000-usb/ft1000_usb.c     |  85 +++---
 drivers/staging/ft1000/ft1000-usb/ft1000_usb.h     |   2 -
 7 files changed, 383 insertions(+), 518 deletions(-)

drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c +4 -2

index deb1256..1150050 100644
@@ -20,6 +20,8 @@
 
   ---------------------------------------------------------------------------*/
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #define __KERNEL_SYSCALLS__
 
 #include <linux/module.h>

@@ -316,7 +318,7 @@ int card_download(struct net_device *dev, const u8 *pFileStart,
 
 	file_version = *(long *)pFileStart;
 	if (file_version != 6) {
-		printk(KERN_ERR "ft1000: unsupported firmware version %ld\n", file_version);
+		pr_err("unsupported firmware version %ld\n", file_version);
 		Status = FAILURE;
 	}

@@ -688,7 +690,7 @@ int card_download(struct net_device *dev, const u8 *pFileStart,
 				uiState = STATE_SECTION_PROV;
 			} else {
 				netdev_dbg(dev,
-					   "FT1000:download:Download error: Bad Port IDs in Pseudo Record\n");
+					   "Download error: Bad Port IDs in Pseudo Record\n");
 				netdev_dbg(dev, "\t Port Source = 0x%2.2x\n",
 					   pHdr->portsrc);
 				netdev_dbg(dev, "\t Port Destination = 0x%2.2x\n",

drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c +131 ~~-209~~

928 lines not on this page · raw message

drivers/staging/ft1000/ft1000-usb/ft1000_debug.c +65 ~~-71~~

446 lines not on this page · raw message

drivers/staging/ft1000/ft1000-usb/ft1000_download.c +59 ~~-79~~

404 lines not on this page · raw message

drivers/staging/ft1000/ft1000-usb/ft1000_hw.c +84 ~~-110~~

627 lines not on this page · raw message

drivers/staging/ft1000/ft1000-usb/ft1000_usb.c +40 ~~-45~~

176 lines not on this page · raw message

drivers/staging/ft1000/ft1000-usb/ft1000_usb.h +0 -2

index 418e6df..fea60d5 100644
@@ -28,8 +28,6 @@ struct app_info_block {
 					*/
 } __packed;
 
-#define DEBUG(args...) pr_info(args)
-
 #define FALSE           0
 #define TRUE            1

Signature · 1 line

2.1.2

Greg Kroah-Hartman

maintainer

2014-11-04 00:36 UTC #6 lore raw

Re: [PATCH V2 2/2] ASoC: staging: ft1000: Logging message neatening

Quoted 10 lines · Joe Perches

Use a more common logging style.
o Convert DEBUG macros to pr_debug
o Add pr_fmt
o Remove embedded function names from pr_debug
o Convert printks to pr_<level>
o Coalesce formats and align arguments
o Add missing terminating newlines
Signed-off-by Joe Perches <[email protected]>

ASoC???

I'll go edit that by hand...

Joe Perches

author

2014-11-04 02:21 UTC #7 lore raw

Re: [PATCH V2 2/2] ASoC: staging: ft1000: Logging message neatening

Quoted 10 lines · Greg Kroah-Hartman

Quoted 9 lines · Joe Perches
Use a more common logging style.
o Convert DEBUG macros to pr_debug
o Add pr_fmt
o Remove embedded function names from pr_debug
o Convert printks to pr_<level>
o Coalesce formats and align arguments
o Add missing terminating newlines

Quoted 5 lines

Quoted 1 line
Signed-off-by Joe Perches <[email protected]>
ASoC???
I'll go edit that by hand...

How odd. It must be some git weirdness I don't understand.

That's just from doing: (after a git pull of your staging-next tree)

$ patch -p1 < ../next/patches/ft1000/0001-staging-ft1000-Whitespace-neatening.patch
$ emacs drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c.rej 
$ git commit -s drivers/staging/ft1000
$ git am ../next/patches/ft1000/0002-staging-ft1000-Logging-message-neatening.patch
$ git format-patch -2 --subject-prefix="PATCH V2" -o patches/ft1000 --cover-letter

I didn't touch either output patch but did edit the cover letter.

and ../next/patches/ft1000/0002-etc... doesn't have ASoC in it.

$ grep -i asoc ../next/patches/ft1000/0002-staging-ft1000-Logging-message-neatening.patch 
$