diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2016-06-23 07:34:27 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-06-25 12:04:48 -0400 |
| commit | 709280da6238629c3b488b7be87c6d9185f4d03e (patch) | |
| tree | e4de3b670b42ab8b8780b14286c9cbb5d708d1fd /drivers/usb/misc/sisusbvga | |
| parent | 97293de977365fe672daec2523e66ef457104921 (diff) | |
tty: vt, consw->con_set_palette cleanup
* allow NULL consw->con_set_palette (some consoles define an empty
hook)
* => remove empty hooks now
* return value of consw->con_set_palette is never checked => make the
function void
* document consw->con_set_palette a bit
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
Cc: linux-usb@vger.kernel.org
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Cc: linux-fbdev@vger.kernel.org
Cc: linux-parisc@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/misc/sisusbvga')
| -rw-r--r-- | drivers/usb/misc/sisusbvga/sisusb_con.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/usb/misc/sisusbvga/sisusb_con.c b/drivers/usb/misc/sisusbvga/sisusb_con.c index a8244ebeb7a7..4112835f4aed 100644 --- a/drivers/usb/misc/sisusbvga/sisusb_con.c +++ b/drivers/usb/misc/sisusbvga/sisusb_con.c | |||
| @@ -595,7 +595,7 @@ sisusbcon_save_screen(struct vc_data *c) | |||
| 595 | } | 595 | } |
| 596 | 596 | ||
| 597 | /* interface routine */ | 597 | /* interface routine */ |
| 598 | static int | 598 | static void |
| 599 | sisusbcon_set_palette(struct vc_data *c, const unsigned char *table) | 599 | sisusbcon_set_palette(struct vc_data *c, const unsigned char *table) |
| 600 | { | 600 | { |
| 601 | struct sisusb_usb_data *sisusb; | 601 | struct sisusb_usb_data *sisusb; |
| @@ -604,17 +604,17 @@ sisusbcon_set_palette(struct vc_data *c, const unsigned char *table) | |||
| 604 | /* Return value not used by vt */ | 604 | /* Return value not used by vt */ |
| 605 | 605 | ||
| 606 | if (!CON_IS_VISIBLE(c)) | 606 | if (!CON_IS_VISIBLE(c)) |
| 607 | return -EINVAL; | 607 | return; |
| 608 | 608 | ||
| 609 | sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num); | 609 | sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num); |
| 610 | if (!sisusb) | 610 | if (!sisusb) |
| 611 | return -EINVAL; | 611 | return; |
| 612 | 612 | ||
| 613 | /* sisusb->lock is down */ | 613 | /* sisusb->lock is down */ |
| 614 | 614 | ||
| 615 | if (sisusb_is_inactive(c, sisusb)) { | 615 | if (sisusb_is_inactive(c, sisusb)) { |
| 616 | mutex_unlock(&sisusb->lock); | 616 | mutex_unlock(&sisusb->lock); |
| 617 | return -EINVAL; | 617 | return; |
| 618 | } | 618 | } |
| 619 | 619 | ||
| 620 | for (i = j = 0; i < 16; i++) { | 620 | for (i = j = 0; i < 16; i++) { |
| @@ -629,8 +629,6 @@ sisusbcon_set_palette(struct vc_data *c, const unsigned char *table) | |||
| 629 | } | 629 | } |
| 630 | 630 | ||
| 631 | mutex_unlock(&sisusb->lock); | 631 | mutex_unlock(&sisusb->lock); |
| 632 | |||
| 633 | return 0; | ||
| 634 | } | 632 | } |
| 635 | 633 | ||
| 636 | /* interface routine */ | 634 | /* interface routine */ |
| @@ -1428,7 +1426,6 @@ static const struct consw sisusb_dummy_con = { | |||
| 1428 | .con_font_get = SISUSBCONDUMMY, | 1426 | .con_font_get = SISUSBCONDUMMY, |
| 1429 | .con_font_default = SISUSBCONDUMMY, | 1427 | .con_font_default = SISUSBCONDUMMY, |
| 1430 | .con_font_copy = SISUSBCONDUMMY, | 1428 | .con_font_copy = SISUSBCONDUMMY, |
| 1431 | .con_set_palette = SISUSBCONDUMMY, | ||
| 1432 | }; | 1429 | }; |
| 1433 | 1430 | ||
| 1434 | int | 1431 | int |
