Re: [PATCH v2 0/5] toshiba_acpi: Driver cleanup

[Darren Hart <dvhart@infradead.org>]

On Wed, May 06, 2015 at 09:08:52AM -0600, Azael Avalos wrote:
> Hi Darren,
> 
> 2015-05-06 0:00 GMT-06:00 Darren Hart <dvhart@infradead.org>:
> > On Mon, May 04, 2015 at 11:15:53AM -0600, Azael Avalos wrote:
> >> These patches cleanup the driver from some no longer needed
> >> functions, renames hci_{read, write}1 functions, some comment
> >> blocks were changed, unneeded error checks removed and the driver
> >> version was bumped to 0.22.
> >>
> >> Changes since v1:
> >> - Added two new patches to the series, one containing error check
> >>   removals and another bumping the driver version.
> >>
> >> Darren:
> >> Sorry for this, I totally forgot to include the patch to remove
> >> the function error check :-(
> >> Now this patchset is complete now :-)
> >>
> >
> > So I'm a little confused :-) I have staged the patches locally as follows
> > (newest first):
> >
> > <top>
> > f6ea7d1 toshiba_acpi: Bump driver version to 0.22
> > dd8b682 toshiba_acpi: Remove TOS_FAILURE check from some functions
> > 60d9349 toshiba_acpi: Cleanup blank lines after comment blocks
> > c62377a toshiba_acpi: Rename hci_{read, write}1 functions
> > cbed7e3 toshiba_acpi: Remove no longer needed hci_{read, write}2 functions
> > 8f163a9 toshiba_acpi: Remove bluetooth rfkill code
> > 0a4c28f toshiba_bluetooth: Change BT status message to debug
> > 3ad2df6 toshiba_bluetooth: Adapt *_enable, *_notify and *_resume functions to rfkill
> > 9eb4797 toshiba_bluetooth: Add RFKill handler functions
> > 1ae8cb3 toshiba_bluetooth: Add a container struct named toshiba_bluetooth_dev
> > ...
> >
> > Is this what you had in mind?
> 
> The BT code removal from toshiba_acpi should come first, then the rfkill
> to the toshiba_bluetooth driver, then all the rest :-)
> 

OK, please have a look at:

http://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git/shortlog/refs/heads/toshiba

This should everything I have pending from you. Please review and let me know if
anything is missing. This will all got toward 4.2. Sorry about the mess.

  CC [M]  drivers/platform/x86/toshiba_bluetooth.o
In file included from include/linux/printk.h:275:0,
                 from include/linux/kernel.h:13,
                 from drivers/platform/x86/toshiba_bluetooth.c:17:
drivers/platform/x86/toshiba_bluetooth.c: In function ‘toshiba_bluetooth_sync_status’:
include/linux/dynamic_debug.h:64:16: warning: format ‘%llu’ expects argument of type ‘long long unsigned int’, but argument 3 has type ‘int’ [-Wformat=]
  static struct _ddebug  __aligned(8)   \
                ^
include/linux/dynamic_debug.h:76:2: note: in expansion of macro ‘DEFINE_DYNAMIC_DEBUG_METADATA’
  DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt);  \
  ^
include/linux/printk.h:281:2: note: in expansion of macro ‘dynamic_pr_debug’
  dynamic_pr_debug(fmt, ##__VA_ARGS__)
  ^
drivers/platform/x86/toshiba_bluetooth.c:158:2: note: in expansion of macro ‘pr_debug’
  pr_debug("Bluetooth status %llu killswitch %d plugged %d powered %d\n",
  ^

Resolved with:

$ git diff
diff --git a/drivers/platform/x86/toshiba_bluetooth.c b/drivers/platform/x86/toshiba_bluetooth.c
index 220645a..c5e4508 100644
--- a/drivers/platform/x86/toshiba_bluetooth.c
+++ b/drivers/platform/x86/toshiba_bluetooth.c
@@ -155,7 +155,7 @@ static int toshiba_bluetooth_sync_status(struct toshiba_bluetooth_dev *bt_dev)
        bt_dev->plugged = (status & BT_PLUGGED_MASK) ? true : false;
        bt_dev->powered = (status & BT_POWER_MASK) ? true : false;
 
-       pr_debug("Bluetooth status %llu killswitch %d plugged %d powered %d\n",
+       pr_debug("Bluetooth status %d killswitch %d plugged %d powered %d\n",
                 status, bt_dev->killswitch, bt_dev->plugged, bt_dev->powered);
 
        return 0;

If this is the change you would make, just ack this here and I'll roll it in -
I don't think I can handle another round of this series ;-)

-- 
Darren Hart
Intel Open Source Technology Center