Input: pcspkr - fix code style and error value in pcspkr_event (9e04b79c) · Commits · 戴 / test

This patch fixes the following issues in pcspkr: * Return -EINVAL when input arguments are not valid in pcspkr_event function instead of -1. * Replace <asm/io.h> with <linux/io.h> * Fix indentation of case blocks in switch statement * Reduce length of line 28 to less than 80 characters The style issues were discovered by checkpatch.pl script. Signed-off-by:

Munir Contractor <munircontractor@gmail.com> Signed-off-by:

Dmitry Torokhov <dmitry.torokhov@gmail.com>

drivers/input/misc/pcspkr.c

+11 −6

Original line number	Diff line number	Diff line
		@@ -18,25 +18,30 @@
		#include <linux/input.h>
		#include <linux/platform_device.h>
		#include <linux/timex.h>
		#include <asm/io.h>
		#include <linux/io.h>

		MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
		MODULE_DESCRIPTION("PC Speaker beeper driver");
		MODULE_LICENSE("GPL");
		MODULE_ALIAS("platform:pcspkr");

		static int pcspkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
		static int pcspkr_event(struct input_dev *dev, unsigned int type,
		unsigned int code, int value)
		{
		unsigned int count = 0;
		unsigned long flags;

		if (type != EV_SND)
		return -1;
		return -EINVAL;

		switch (code) {
		case SND_BELL: if (value) value = 1000;
		case SND_TONE: break;
		default: return -1;
		case SND_BELL:
		if (value)
		value = 1000;
		case SND_TONE:
		break;
		default:
		return -EINVAL;
		}

		if (value > 20 && value < 32767)

Admin message