2009-06-22 09:08:43

by Frans Pop

Subject: [PATCH] trivial: cleanup hpfall example code (checkpatch)

This patch makes hpfall.c conform to kernel coding style.

I have not fixed the C99 // comments on two lines as they
help indicate that those are not actually comments but
incomplete code.

Before:
total: 10 errors, 6 warnings, 101 lines checked
After:
total: 2 errors, 0 warnings, 99 lines checked

Signed-off-by: Frans Pop <[email protected]>
Cc: Pavel Machek <[email protected]>

diff --git a/Documentation/hwmon/hpfall.c b/Documentation/hwmon/hpfall.c
index bbea1cc..d2f6711 100644
--- a/Documentation/hwmon/hpfall.c
+++ b/Documentation/hwmon/hpfall.c
@@ -57,45 +57,43 @@ void ignore_me(void)
{
protect(0);
set_led(0);
-
}

-int main(int argc, char* argv[])
+int main(int argc, char *argv[])
{
- int fd, ret;
+ int fd, ret;

- fd = open("/dev/freefall", O_RDONLY);
- if (fd < 0) {
- perror("open");
- return EXIT_FAILURE;
- }
+ fd = open("/dev/freefall", O_RDONLY);
+ if (fd < 0) {
+ perror("open");
+ return EXIT_FAILURE;
+ }

signal(SIGALRM, ignore_me);

- for (;;) {
- unsigned char count;
-
- ret = read(fd, &count, sizeof(count));
- alarm(0);
- if ((ret == -1) && (errno == EINTR)) {
- /* Alarm expired, time to unpark the heads */
- continue;
- }
-
- if (ret != sizeof(count)) {
- perror("read");
- break;
- }
-
- protect(21);
- set_led(1);
- if (1 || on_ac() || lid_open()) {
- alarm(2);
- } else {
- alarm(20);
- }
- }
+ for (;;) {
+ unsigned char count;
+
+ ret = read(fd, &count, sizeof(count));
+ alarm(0);
+ if ((ret == -1) && (errno == EINTR)) {
+ /* Alarm expired, time to unpark the heads */
+ continue;
+ }
+
+ if (ret != sizeof(count)) {
+ perror("read");
+ break;
+ }
+
+ protect(21);
+ set_led(1);
+ if (1 || on_ac() || lid_open())
+ alarm(2);
+ else
+ alarm(20);
+ }

- close(fd);
- return EXIT_SUCCESS;
+ close(fd);
+ return EXIT_SUCCESS;
}

2009-06-22 17:21:24

by Pavel Machek

Subject: Re: [PATCH] trivial: cleanup hpfall example code (checkpatch)

On Mon 2009-06-22 11:08:36, Frans Pop wrote:
> This patch makes hpfall.c conform to kernel coding style.
>
> I have not fixed the C99 // comments on two lines as they
> help indicate that those are not actually comments but
> incomplete code.
>
> Before:
> total: 10 errors, 6 warnings, 101 lines checked
> After:
> total: 2 errors, 0 warnings, 99 lines checked
>
> Signed-off-by: Frans Pop <[email protected]>

Acked-by: Pavel Machek <[email protected]>

--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

2009-06-23 09:20:28

by Jiri Kosina

Subject: Re: [PATCH] trivial: cleanup hpfall example code (checkpatch)

On Mon, 22 Jun 2009, Pavel Machek wrote:

> On Mon 2009-06-22 11:08:36, Frans Pop wrote:
> > This patch makes hpfall.c conform to kernel coding style.
> >
> > I have not fixed the C99 // comments on two lines as they
> > help indicate that those are not actually comments but
> > incomplete code.
> >
> > Before:
> > total: 10 errors, 6 warnings, 101 lines checked
> > After:
> > total: 2 errors, 0 warnings, 99 lines checked
> >
> > Signed-off-by: Frans Pop <[email protected]>
>
> Acked-by: Pavel Machek <[email protected]>

Applied, thanks Frans.

--
Jiri Kosina
SUSE Labs