[PATCH v1 1/3] platform/x86: asus-wmi: Join string literals back

[PATCH v1 1/3] platform/x86: asus-wmi: Join string literals back

[Andy Shevchenko]

For easy grepping on debug purposes join string literals back in
the messages.

No functional change.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/platform/x86/asus-wmi.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index 6fa4b0be8e76..30e0de9e0d81 100644
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -1154,12 +1154,10 @@ static void asus_rfkill_hotplug(struct asus_wmi *asus)
 		absent = (l == 0xffffffff);
 
 		if (blocked != absent) {
-			pr_warn("BIOS says wireless lan is %s, "
-				"but the pci device is %s\n",
+			pr_warn("BIOS says wireless lan is %s, but the pci device is %s\n",
 				blocked ? "blocked" : "unblocked",
 				absent ? "absent" : "present");
-			pr_warn("skipped wireless hotplug as probably "
-				"inappropriate for this model\n");
+			pr_warn("skipped wireless hotplug as probably inappropriate for this model\n");
 			goto out_unlock;
 		}
 
-- 
2.33.0

[PATCH v1 2/3] platform/x86: asus-wmi: Split MODULE_AUTHOR() on per author basis

[Andy Shevchenko]

There are as many as needed MODULE_AUTHOR() macro entries allowed
in the single driver. Split author list to a few macro entries.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/platform/x86/asus-wmi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index 30e0de9e0d81..c3e0394aa5f0 100644
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -43,8 +43,8 @@
 
 #include "asus-wmi.h"
 
-MODULE_AUTHOR("Corentin Chary <corentin.chary@gmail.com>, "
-	      "Yong Wang <yong.y.wang@intel.com>");
+MODULE_AUTHOR("Corentin Chary <corentin.chary@gmail.com>");
+MODULE_AUTHOR("Yong Wang <yong.y.wang@intel.com>");
 MODULE_DESCRIPTION("Asus Generic WMI Driver");
 MODULE_LICENSE("GPL");
 
-- 
2.33.0

[PATCH v1 3/3] platform/x86: asus-wmi: Reshuffle headers for better maintenance

[Andy Shevchenko]

Reshuffle headers in alphabetical order for better maintenance.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/platform/x86/asus-wmi.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index c3e0394aa5f0..a3b83b22a3b1 100644
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -13,29 +13,29 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/acpi.h>
+#include <linux/backlight.h>
+#include <linux/debugfs.h>
+#include <linux/dmi.h>
+#include <linux/fb.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
 #include <linux/init.h>
-#include <linux/types.h>
-#include <linux/slab.h>
 #include <linux/input.h>
 #include <linux/input/sparse-keymap.h>
-#include <linux/fb.h>
-#include <linux/backlight.h>
+#include <linux/kernel.h>
 #include <linux/leds.h>
-#include <linux/rfkill.h>
+#include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/pci_hotplug.h>
+#include <linux/platform_data/x86/asus-wmi.h>
+#include <linux/platform_device.h>
 #include <linux/platform_profile.h>
 #include <linux/power_supply.h>
-#include <linux/hwmon.h>
-#include <linux/hwmon-sysfs.h>
-#include <linux/debugfs.h>
+#include <linux/rfkill.h>
 #include <linux/seq_file.h>
-#include <linux/platform_data/x86/asus-wmi.h>
-#include <linux/platform_device.h>
-#include <linux/acpi.h>
-#include <linux/dmi.h>
+#include <linux/slab.h>
+#include <linux/types.h>
 #include <linux/units.h>
 
 #include <acpi/battery.h>
-- 
2.33.0

Re: [PATCH v1 1/3] platform/x86: asus-wmi: Join string literals back

[Andy Shevchenko]

On Fri, Dec 10, 2021 at 06:30:07PM +0200, Andy Shevchenko wrote:
> For easy grepping on debug purposes join string literals back in
> the messages.
> 
> No functional change.

Hans, any comments on the series?

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH v1 1/3] platform/x86: asus-wmi: Join string literals back

[Hans de Goede]

Hi,

On 12/20/21 14:07, Andy Shevchenko wrote:
> On Fri, Dec 10, 2021 at 06:30:07PM +0200, Andy Shevchenko wrote:
>> For easy grepping on debug purposes join string literals back in
>> the messages.
>>
>> No functional change.
> 
> Hans, any comments on the series?

No comments, the series looks good to me. I plan to another round of
merging pdx86 patches tomorrow and then I plan to pick these up too.

Regards,

Hans

Re: [PATCH v1 1/3] platform/x86: asus-wmi: Join string literals back

[Andy Shevchenko]

On Mon, Dec 20, 2021 at 02:30:20PM +0100, Hans de Goede wrote:
> On 12/20/21 14:07, Andy Shevchenko wrote:
> > On Fri, Dec 10, 2021 at 06:30:07PM +0200, Andy Shevchenko wrote:
> >> For easy grepping on debug purposes join string literals back in
> >> the messages.
> >>
> >> No functional change.
> > 
> > Hans, any comments on the series?
> 
> No comments, the series looks good to me. I plan to another round of
> merging pdx86 patches tomorrow and then I plan to pick these up too.

Thanks for good news!

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH v1 1/3] platform/x86: asus-wmi: Join string literals back

[Hans de Goede]

Hi,

On 12/10/21 17:30, Andy Shevchenko wrote:
> For easy grepping on debug purposes join string literals back in
> the messages.
> 
> No functional change.
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

Thank you for your patch-series, I've applied the series to my
review-hans branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans

Note it will show up in my review-hans branch once I've pushed my
local branch there, which might take a while.

Once I've run some tests on this branch the patches there will be
added to the platform-drivers-x86/for-next branch and eventually
will be included in the pdx86 pull-request to Linus for the next
merge-window.

Regards,

Hans


> ---
>  drivers/platform/x86/asus-wmi.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
> index 6fa4b0be8e76..30e0de9e0d81 100644
> --- a/drivers/platform/x86/asus-wmi.c
> +++ b/drivers/platform/x86/asus-wmi.c
> @@ -1154,12 +1154,10 @@ static void asus_rfkill_hotplug(struct asus_wmi *asus)
>  		absent = (l == 0xffffffff);
>  
>  		if (blocked != absent) {
> -			pr_warn("BIOS says wireless lan is %s, "
> -				"but the pci device is %s\n",
> +			pr_warn("BIOS says wireless lan is %s, but the pci device is %s\n",
>  				blocked ? "blocked" : "unblocked",
>  				absent ? "absent" : "present");
> -			pr_warn("skipped wireless hotplug as probably "
> -				"inappropriate for this model\n");
> +			pr_warn("skipped wireless hotplug as probably inappropriate for this model\n");
>  			goto out_unlock;
>  		}
>  
>