[GIT PULL] cpupower update for Linux 5.9-rc1

[GIT PULL] cpupower update for Linux 5.9-rc1

[Shuah Khan]

[-- Attachment #1: Type: text/plain, Size: 1530 bytes --]

Hi Rafael,

Please pull the following cpupower update for Linux 5.9-rc1.

This cpupower update for Linux 5.9-rc1 consists of 2 fixes to coccicheck
warnings and one change to replacing HTTP links with HTTPS ones.

diff is attached.

thanks,
-- Shuah

----------------------------------------------------------------
The following changes since commit b3a9e3b9622ae10064826dccb4f7a52bd88c7407:

   Linux 5.8-rc1 (2020-06-14 12:45:04 -0700)

are available in the Git repository at:

   git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux 
tags/linux-cpupower-5.9-rc1

for you to fetch changes up to fa0866a1d1be8ffa6979bf2127272b7e3d511fcd:

   cpupower: Replace HTTP links with HTTPS ones (2020-07-17 11:58:04 -0600)

----------------------------------------------------------------
linux-cpupower-5.9-rc1

This cpupower update for Linux 5.9-rc1 consists of 2 fixes to coccicheck
warnings and one change to replacing HTTP links with HTTPS ones.

----------------------------------------------------------------
Alexander A. Klimov (1):
       cpupower: Replace HTTP links with HTTPS ones

Shuah Khan (2):
       cpupower: Fix comparing pointer to 0 coccicheck warns
       cpupower: Fix NULL but dereferenced coccicheck errors

  tools/power/cpupower/lib/cpufreq.c           | 10 +++++-----
  tools/power/cpupower/man/cpupower-monitor.1  |  4 ++--
  tools/power/cpupower/utils/helpers/bitmask.c |  6 +++---
  3 files changed, 10 insertions(+), 10 deletions(-)

----------------------------------------------------------------

[-- Attachment #2: linux-cpupower-5.9-rc1.diff --]
[-- Type: text/x-patch, Size: 3130 bytes --]

diff --git a/tools/power/cpupower/lib/cpufreq.c b/tools/power/cpupower/lib/cpufreq.c
index 6e04304560ca..c3b56db8b921 100644
--- a/tools/power/cpupower/lib/cpufreq.c
+++ b/tools/power/cpupower/lib/cpufreq.c
@@ -285,7 +285,7 @@ struct cpufreq_available_governors *cpufreq_get_available_governors(unsigned
 			} else {
 				first = malloc(sizeof(*first));
 				if (!first)
-					goto error_out;
+					return NULL;
 				current = first;
 			}
 			current->first = first;
@@ -362,7 +362,7 @@ struct cpufreq_available_frequencies
 			} else {
 				first = malloc(sizeof(*first));
 				if (!first)
-					goto error_out;
+					return NULL;
 				current = first;
 			}
 			current->first = first;
@@ -418,7 +418,7 @@ struct cpufreq_available_frequencies
 			} else {
 				first = malloc(sizeof(*first));
 				if (!first)
-					goto error_out;
+					return NULL;
 				current = first;
 			}
 			current->first = first;
@@ -493,7 +493,7 @@ static struct cpufreq_affected_cpus *sysfs_get_cpu_list(unsigned int cpu,
 			} else {
 				first = malloc(sizeof(*first));
 				if (!first)
-					goto error_out;
+					return NULL;
 				current = first;
 			}
 			current->first = first;
@@ -726,7 +726,7 @@ struct cpufreq_stats *cpufreq_get_stats(unsigned int cpu,
 			} else {
 				first = malloc(sizeof(*first));
 				if (!first)
-					goto error_out;
+					return NULL;
 				current = first;
 			}
 			current->first = first;
diff --git a/tools/power/cpupower/man/cpupower-monitor.1 b/tools/power/cpupower/man/cpupower-monitor.1
index 70a56476f4b0..8ee737eefa5c 100644
--- a/tools/power/cpupower/man/cpupower-monitor.1
+++ b/tools/power/cpupower/man/cpupower-monitor.1
@@ -170,7 +170,7 @@ displayed.
 
 .SH REFERENCES
 "BIOS and Kernel Developer’s Guide (BKDG) for AMD Family 14h Processors"
-http://support.amd.com/us/Processor_TechDocs/43170.pdf
+https://support.amd.com/us/Processor_TechDocs/43170.pdf
 
 "Intel® Turbo Boost Technology
 in Intel® Core™ Microarchitecture (Nehalem) Based Processors"
@@ -178,7 +178,7 @@ http://download.intel.com/design/processor/applnots/320354.pdf
 
 "Intel® 64 and IA-32 Architectures Software Developer's Manual
 Volume 3B: System Programming Guide"
-http://www.intel.com/products/processor/manuals
+https://www.intel.com/products/processor/manuals
 
 .SH FILES
 .ta
diff --git a/tools/power/cpupower/utils/helpers/bitmask.c b/tools/power/cpupower/utils/helpers/bitmask.c
index 6c7932f5bd66..649d87cb8b0f 100644
--- a/tools/power/cpupower/utils/helpers/bitmask.c
+++ b/tools/power/cpupower/utils/helpers/bitmask.c
@@ -26,11 +26,11 @@ struct bitmask *bitmask_alloc(unsigned int n)
 	struct bitmask *bmp;
 
 	bmp = malloc(sizeof(*bmp));
-	if (bmp == 0)
+	if (!bmp)
 		return 0;
 	bmp->size = n;
 	bmp->maskp = calloc(longsperbits(n), sizeof(unsigned long));
-	if (bmp->maskp == 0) {
+	if (!bmp->maskp) {
 		free(bmp);
 		return 0;
 	}
@@ -40,7 +40,7 @@ struct bitmask *bitmask_alloc(unsigned int n)
 /* Free `struct bitmask` */
 void bitmask_free(struct bitmask *bmp)
 {
-	if (bmp == 0)
+	if (!bmp)
 		return;
 	free(bmp->maskp);
 	bmp->maskp = (unsigned long *)0xdeadcdef;  /* double free tripwire */

Re: [GIT PULL] cpupower update for Linux 5.9-rc1

[Rafael J. Wysocki]

Hi Shuah,

On Sat, Jul 25, 2020 at 1:17 AM Shuah Khan <skhan@linuxfoundation.org> wrote:
>
> Hi Rafael,
>
> Please pull the following cpupower update for Linux 5.9-rc1.
>
> This cpupower update for Linux 5.9-rc1 consists of 2 fixes to coccicheck
> warnings and one change to replacing HTTP links with HTTPS ones.
>
> diff is attached.

Pulled, thanks!