diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/input/serio/gscps2.c | 6 | ||||
| -rw-r--r-- | drivers/parisc/led.c | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/drivers/input/serio/gscps2.c b/drivers/input/serio/gscps2.c index 4fada5bc2a38..9c6ff04c46cf 100644 --- a/drivers/input/serio/gscps2.c +++ b/drivers/input/serio/gscps2.c @@ -251,6 +251,8 @@ static bool gscps2_report_data(struct gscps2port *ps2port) /** * gscps2_interrupt() - Interruption service routine + * @irq: interrupt number which triggered (unused) + * @dev: device pointer (unused) * * This function reads received PS/2 bytes and processes them on * all interfaces. @@ -329,6 +331,8 @@ static void gscps2_close(struct serio *port) /** * gscps2_probe() - Probes PS2 devices + * @dev: pointer to parisc_device struct which will be probed + * * @return: success/error report */ @@ -420,6 +424,8 @@ fail_nomem: /** * gscps2_remove() - Removes PS2 devices + * @dev: pointer to parisc_device which shall be removed + * * @return: success/error report */ diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c index e71674753711..016c9d5a60a8 100644 --- a/drivers/parisc/led.c +++ b/drivers/parisc/led.c @@ -39,7 +39,6 @@ static unsigned char led_type; /* bitmask of LED_HAS_XXX */ static unsigned char lastleds; /* LED state from most recent update */ static unsigned char lcd_new_text; static unsigned char lcd_text[20]; -static unsigned char lcd_text_default[20]; static unsigned char lcd_no_led_support; /* KittyHawk doesn't support LED on its LCD */ struct lcd_block { @@ -456,9 +455,8 @@ static int __init early_led_init(void) struct pdc_chassis_info chassis_info; int ret; - snprintf(lcd_text_default, sizeof(lcd_text_default), + scnprintf(lcd_text, sizeof(lcd_text), "Linux %s", init_utsname()->release); - strcpy(lcd_text, lcd_text_default); lcd_new_text = 1; /* Work around the buggy PDC of KittyHawk-machines */ |