Commit 73c3700e authored by Derek Robson's avatar Derek Robson Committed by Greg Kroah-Hartman
Browse files

Staging: speakup - syle fix permissions to octal 



A style fix across whole driver.
changed permissions to octal style, found using checkpatch

Signed-off-by: default avatarDerek Robson <robsonde@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 63d8d50c

drivers/staging/speakup/main.c

+2 −2
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ MODULE_LICENSE("GPL"); 
MODULE_VERSION(SPEAKUP_VERSION);



char *synth_name;

module_param_named(synth, synth_name, charp, S_IRUGO);

module_param_named(quiet, spk_quiet_boot, bool, S_IRUGO);

module_param_named(synth, synth_name, charp, 0444);

module_param_named(quiet, spk_quiet_boot, bool, 0444);



MODULE_PARM_DESC(synth, "Synth to start if speakup is built in.");

MODULE_PARM_DESC(quiet, "Do not announce when the synthesizer is found.");

drivers/staging/speakup/speakup.h

+2 −2
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ 
#define MAX_DESC_LEN 72



/* proc permissions */

#define USER_R (S_IFREG|S_IRUGO)

#define USER_W (S_IFREG|S_IWUGO)

#define USER_R (S_IFREG | 0444)

#define USER_W (S_IFREG | 0666)



#define TOGGLE_0 .u.n = {NULL, 0, 0, 1, 0, 0, NULL }

#define TOGGLE_1 .u.n = {NULL, 1, 0, 1, 0, 0, NULL }

drivers/staging/speakup/speakup_acntpc.c

+13 −13
Original line number Diff line number Diff line
@@ -57,28 +57,28 @@ static struct var_t vars[] = { 
 * These attributes will appear in /sys/accessibility/speakup/acntpc.

 */

static struct kobj_attribute caps_start_attribute =

	__ATTR(caps_start, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);

	__ATTR(caps_start, 0644, spk_var_show, spk_var_store);

static struct kobj_attribute caps_stop_attribute =

	__ATTR(caps_stop, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);

	__ATTR(caps_stop, 0644, spk_var_show, spk_var_store);

static struct kobj_attribute pitch_attribute =

	__ATTR(pitch, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);

	__ATTR(pitch, 0644, spk_var_show, spk_var_store);

static struct kobj_attribute rate_attribute =

	__ATTR(rate, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);

	__ATTR(rate, 0644, spk_var_show, spk_var_store);

static struct kobj_attribute tone_attribute =

	__ATTR(tone, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);

	__ATTR(tone, 0644, spk_var_show, spk_var_store);

static struct kobj_attribute vol_attribute =

	__ATTR(vol, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);

	__ATTR(vol, 0644, spk_var_show, spk_var_store);



static struct kobj_attribute delay_time_attribute =

	__ATTR(delay_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);

	__ATTR(delay_time, 0644, spk_var_show, spk_var_store);

static struct kobj_attribute direct_attribute =

	__ATTR(direct, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);

	__ATTR(direct, 0644, spk_var_show, spk_var_store);

static struct kobj_attribute full_time_attribute =

	__ATTR(full_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);

	__ATTR(full_time, 0644, spk_var_show, spk_var_store);

static struct kobj_attribute jiffy_delta_attribute =

	__ATTR(jiffy_delta, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);

	__ATTR(jiffy_delta, 0644, spk_var_show, spk_var_store);

static struct kobj_attribute trigger_time_attribute =

	__ATTR(trigger_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);

	__ATTR(trigger_time, 0644, spk_var_show, spk_var_store);



/*

 * Create a group of attributes so that we can create and destroy them all
@@ -307,8 +307,8 @@ static void accent_release(void) 
	speakup_info.port_tts = 0;

}



module_param_named(port, port_forced, int, S_IRUGO);

module_param_named(start, synth_acntpc.startup, short, S_IRUGO);

module_param_named(port, port_forced, int, 0444);

module_param_named(start, synth_acntpc.startup, short, 0444);



MODULE_PARM_DESC(port, "Set the port for the synthesizer (override probing).");

MODULE_PARM_DESC(start, "Start the synthesizer once it is loaded.");

drivers/staging/speakup/speakup_acntsa.c

+13 −13
Original line number Diff line number Diff line
@@ -43,28 +43,28 @@ static struct var_t vars[] = { 
 * These attributes will appear in /sys/accessibility/speakup/acntsa.

 */

static struct kobj_attribute caps_start_attribute =

	__ATTR(caps_start, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);

	__ATTR(caps_start, 0644, spk_var_show, spk_var_store);

static struct kobj_attribute caps_stop_attribute =

	__ATTR(caps_stop, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);

	__ATTR(caps_stop, 0644, spk_var_show, spk_var_store);

static struct kobj_attribute pitch_attribute =

	__ATTR(pitch, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);

	__ATTR(pitch, 0644, spk_var_show, spk_var_store);

static struct kobj_attribute rate_attribute =

	__ATTR(rate, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);

	__ATTR(rate, 0644, spk_var_show, spk_var_store);

static struct kobj_attribute tone_attribute =

	__ATTR(tone, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);

	__ATTR(tone, 0644, spk_var_show, spk_var_store);

static struct kobj_attribute vol_attribute =

	__ATTR(vol, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);

	__ATTR(vol, 0644, spk_var_show, spk_var_store);



static struct kobj_attribute delay_time_attribute =

	__ATTR(delay_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);

	__ATTR(delay_time, 0644, spk_var_show, spk_var_store);

static struct kobj_attribute direct_attribute =

	__ATTR(direct, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);

	__ATTR(direct, 0644, spk_var_show, spk_var_store);

static struct kobj_attribute full_time_attribute =

	__ATTR(full_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);

	__ATTR(full_time, 0644, spk_var_show, spk_var_store);

static struct kobj_attribute jiffy_delta_attribute =

	__ATTR(jiffy_delta, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);

	__ATTR(jiffy_delta, 0644, spk_var_show, spk_var_store);

static struct kobj_attribute trigger_time_attribute =

	__ATTR(trigger_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);

	__ATTR(trigger_time, 0644, spk_var_show, spk_var_store);



/*

 * Create a group of attributes so that we can create and destroy them all
@@ -133,8 +133,8 @@ static int synth_probe(struct spk_synth *synth) 
	return failed;

}



module_param_named(ser, synth_acntsa.ser, int, S_IRUGO);

module_param_named(start, synth_acntsa.startup, short, S_IRUGO);

module_param_named(ser, synth_acntsa.ser, int, 0444);

module_param_named(start, synth_acntsa.startup, short, 0444);



MODULE_PARM_DESC(ser, "Set the serial port for the synthesizer (0-based).");

MODULE_PARM_DESC(start, "Start the synthesizer once it is loaded.");

drivers/staging/speakup/speakup_apollo.c

+14 −14
Original line number Diff line number Diff line
@@ -49,30 +49,30 @@ static struct var_t vars[] = { 
 * These attributes will appear in /sys/accessibility/speakup/apollo.

 */

static struct kobj_attribute caps_start_attribute =

	__ATTR(caps_start, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);

	__ATTR(caps_start, 0644, spk_var_show, spk_var_store);

static struct kobj_attribute caps_stop_attribute =

	__ATTR(caps_stop, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);

	__ATTR(caps_stop, 0644, spk_var_show, spk_var_store);

static struct kobj_attribute lang_attribute =

	__ATTR(lang, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);

	__ATTR(lang, 0644, spk_var_show, spk_var_store);

static struct kobj_attribute pitch_attribute =

	__ATTR(pitch, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);

	__ATTR(pitch, 0644, spk_var_show, spk_var_store);

static struct kobj_attribute rate_attribute =

	__ATTR(rate, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);

	__ATTR(rate, 0644, spk_var_show, spk_var_store);

static struct kobj_attribute voice_attribute =

	__ATTR(voice, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);

	__ATTR(voice, 0644, spk_var_show, spk_var_store);

static struct kobj_attribute vol_attribute =

	__ATTR(vol, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);

	__ATTR(vol, 0644, spk_var_show, spk_var_store);



static struct kobj_attribute delay_time_attribute =

	__ATTR(delay_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);

	__ATTR(delay_time, 0644, spk_var_show, spk_var_store);

static struct kobj_attribute direct_attribute =

	__ATTR(direct, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);

	__ATTR(direct, 0644, spk_var_show, spk_var_store);

static struct kobj_attribute full_time_attribute =

	__ATTR(full_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);

	__ATTR(full_time, 0644, spk_var_show, spk_var_store);

static struct kobj_attribute jiffy_delta_attribute =

	__ATTR(jiffy_delta, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);

	__ATTR(jiffy_delta, 0644, spk_var_show, spk_var_store);

static struct kobj_attribute trigger_time_attribute =

	__ATTR(trigger_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);

	__ATTR(trigger_time, 0644, spk_var_show, spk_var_store);



/*

 * Create a group of attributes so that we can create and destroy them all
@@ -197,8 +197,8 @@ static void do_catch_up(struct spk_synth *synth) 
	spk_serial_out(PROCSPEECH);

}



module_param_named(ser, synth_apollo.ser, int, S_IRUGO);

module_param_named(start, synth_apollo.startup, short, S_IRUGO);

module_param_named(ser, synth_apollo.ser, int, 0444);

module_param_named(start, synth_apollo.startup, short, 0444);



MODULE_PARM_DESC(ser, "Set the serial port for the synthesizer (0-based).");

MODULE_PARM_DESC(start, "Start the synthesizer once it is loaded.");

CRA Git | Maintained and supported by SUSTech CRA and CCSE