Author: kib
Date: Thu Jan 4 11:38:42 2018
New Revision: 327543
URL: https://svnweb.freebsd.org/changeset/base/327543
Log:
MFC r327284:
Style. Remove useless return.
Modified:
stable/11/usr.sbin/cpucontrol/intel.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/usr.sbin/cpucontrol/intel.c
==============================================================================
--- stable/11/usr.sbin/cpucontrol/intel.c Thu Jan 4 11:36:13 2018
(r327542)
+++ stable/11/usr.sbin/cpucontrol/intel.c Thu Jan 4 11:38:42 2018
(r327543)
@@ -86,7 +86,7 @@ intel_update(const char *dev, const char *path)
intel_fw_header_t *fw_header;
intel_cpu_signature_t *ext_table;
intel_ext_header_t *ext_header;
- uint32_t signature, flags;
+ uint32_t sig, signature, flags;
int32_t revision;
ssize_t ext_size;
size_t ext_table_size;
@@ -229,7 +229,8 @@ intel_update(const char *dev, const char *path)
for (i = 0; i < (ext_table_size / sizeof(uint32_t)); i++)
sum += *((uint32_t *)ext_header + i);
if (sum != 0) {
- WARNX(2, "%s: extended signature table checksum
invalid",
+ WARNX(2,
+ "%s: extended signature table checksum invalid",
path);
goto no_table;
}
@@ -244,10 +245,10 @@ no_table:
*/
if (signature == fw_header->cpu_signature &&
(flags & fw_header->cpu_flags) != 0)
- goto matched;
+ goto matched;
else if (have_ext_table != 0) {
for (i = 0; i < ext_header->sig_count; i++) {
- uint32_t sig = ext_table[i].cpu_signature;
+ sig = ext_table[i].cpu_signature;
if (signature == sig &&
(flags & ext_table[i].cpu_flags) != 0)
goto matched;
@@ -262,14 +263,14 @@ matched:
goto fail;
}
fprintf(stderr, "%s: updating cpu %s from rev %#x to rev %#x... ",
- path, dev, revision, fw_header->revision);
+ path, dev, revision, fw_header->revision);
args.data = fw_data;
args.size = data_size;
error = ioctl(devfd, CPUCTL_UPDATE, &args);
if (error < 0) {
- error = errno;
+ error = errno;
fprintf(stderr, "failed.\n");
- errno = error;
+ errno = error;
WARN(0, "ioctl()");
goto fail;
}
@@ -283,5 +284,4 @@ fail:
close(devfd);
if (fd >= 0)
close(fd);
- return;
}
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
