Commit f1c6b7fb authored by William Hubbs's avatar William Hubbs Committed by Greg Kroah-Hartman
Browse files

staging: speakup: kobjects.c: style fixes 



clean upd this file based on reports from checkpatch.pl

Signed-off-by: default avatarWilliam Hubbs <w.d.hubbs@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 09adcb52

drivers/staging/speakup/kobjects.c

+26 −21
Original line number Diff line number Diff line
@@ -212,7 +212,8 @@ static ssize_t chars_chartab_store(struct kobject *kobj, 
	}



	spk_unlock(flags);

	report_char_chartab_status(reset, received, used, rejected, do_characters);

	report_char_chartab_status(reset, received, used, rejected,

		do_characters);

	return retval;

}
@@ -237,7 +238,7 @@ static ssize_t keymap_show(struct kobject *kobj, struct kobj_attribute *attr, 
	cp += sprintf(cp, "%d, %d, %d,\n", KEY_MAP_VER, num_keys, nstates);

	cp1 += 2; /* now pointing at shift states */

	/* dump num_keys+1 as first row is shift states + flags,

   each subsequent row is key + states */

	 * each subsequent row is key + states */

	for (n = 0; n <= num_keys; n++) {

		for (i = 0; i <= nstates; i++) {

			ch = *cp1++;
@@ -401,8 +402,8 @@ static ssize_t synth_store(struct kobject *kobj, struct kobj_attribute *attr, 
/*

 * This is called when text is sent to the synth via the synth_direct file.

 */

static ssize_t synth_direct_store(struct kobject *kobj, struct kobj_attribute *attr,

			 const char *buf, size_t count)

static ssize_t synth_direct_store(struct kobject *kobj,

	struct kobj_attribute *attr, const char *buf, size_t count)

{

	u_char tmp[256];

	int len;
@@ -457,7 +458,8 @@ static ssize_t punc_show(struct kobject *kobj, struct kobj_attribute *attr, 


	p_header = var_header_by_name(attr->attr.name);

	if (p_header == NULL) {

		pr_warn("p_header is null, attr->attr.name is %s\n", attr->attr.name);

		pr_warn("p_header is null, attr->attr.name is %s\n",

			attr->attr.name);

		return -EINVAL;

	}
@@ -498,7 +500,8 @@ static ssize_t punc_store(struct kobject *kobj, struct kobj_attribute *attr, 


	p_header = var_header_by_name(attr->attr.name);

	if (p_header == NULL) {

		pr_warn("p_header is null, attr->attr.name is %s\n", attr->attr.name);

		pr_warn("p_header is null, attr->attr.name is %s\n",

			attr->attr.name);

		return -EINVAL;

	}
@@ -652,14 +655,16 @@ ssize_t spk_var_store(struct kobject *kobj, struct kobj_attribute *attr, 
		if (synth && synth->default_pitch) {

			param = var_header_by_name("pitch");

			if (param)  {

				set_num_var(synth->default_pitch[value], param, E_NEW_DEFAULT);

				set_num_var(synth->default_pitch[value], param,

					E_NEW_DEFAULT);

				set_num_var(0, param, E_DEFAULT);

			}

		}

		if (synth && synth->default_vol) {

			param = var_header_by_name("vol");

			if (param)  {

				set_num_var(synth->default_vol[value], param, E_NEW_DEFAULT);

				set_num_var(synth->default_vol[value], param,

					E_NEW_DEFAULT);

				set_num_var(0, param, E_DEFAULT);

			}

		}