summaryrefslogtreecommitdiffstats
path: root/drivers/input/serio
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2017-08-21 16:03:39 -0400
committerHelge Deller <deller@gmx.de>2017-08-22 10:34:37 -0400
commitc1bebd070008e5cca8ab6a0d183068b9f51f6f50 (patch)
treed772c16d96c09e6996929098514c22fcb31048c1 /drivers/input/serio
parentcfe4fbfb23b3280e9a4d1c3b8438c1558a6a614d (diff)
parisc/serio: Fix section mismatches in gscps2 and hp_sdc drivers
Signed-off-by: Helge Deller <deller@gmx.de>
Diffstat (limited to 'drivers/input/serio')
-rw-r--r--drivers/input/serio/gscps2.c10
-rw-r--r--drivers/input/serio/hp_sdc.c4
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/input/serio/gscps2.c b/drivers/input/serio/gscps2.c
index ecba666afadb..aa9f29b875de 100644
--- a/drivers/input/serio/gscps2.c
+++ b/drivers/input/serio/gscps2.c
@@ -325,7 +325,7 @@ static void gscps2_close(struct serio *port)
325 * @return: success/error report 325 * @return: success/error report
326 */ 326 */
327 327
328static int gscps2_probe(struct parisc_device *dev) 328static int __init gscps2_probe(struct parisc_device *dev)
329{ 329{
330 struct gscps2port *ps2port; 330 struct gscps2port *ps2port;
331 struct serio *serio; 331 struct serio *serio;
@@ -412,7 +412,7 @@ fail_nomem:
412 * @return: success/error report 412 * @return: success/error report
413 */ 413 */
414 414
415static int gscps2_remove(struct parisc_device *dev) 415static int __exit gscps2_remove(struct parisc_device *dev)
416{ 416{
417 struct gscps2port *ps2port = dev_get_drvdata(&dev->dev); 417 struct gscps2port *ps2port = dev_get_drvdata(&dev->dev);
418 418
@@ -430,7 +430,7 @@ static int gscps2_remove(struct parisc_device *dev)
430} 430}
431 431
432 432
433static struct parisc_device_id gscps2_device_tbl[] = { 433static const struct parisc_device_id gscps2_device_tbl[] __initconst = {
434 { HPHW_FIO, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x00084 }, /* LASI PS/2 */ 434 { HPHW_FIO, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x00084 }, /* LASI PS/2 */
435#ifdef DINO_TESTED 435#ifdef DINO_TESTED
436 { HPHW_FIO, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x00096 }, /* DINO PS/2 */ 436 { HPHW_FIO, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x00096 }, /* DINO PS/2 */
@@ -439,11 +439,11 @@ static struct parisc_device_id gscps2_device_tbl[] = {
439}; 439};
440MODULE_DEVICE_TABLE(parisc, gscps2_device_tbl); 440MODULE_DEVICE_TABLE(parisc, gscps2_device_tbl);
441 441
442static struct parisc_driver parisc_ps2_driver = { 442static struct parisc_driver parisc_ps2_driver __refdata = {
443 .name = "gsc_ps2", 443 .name = "gsc_ps2",
444 .id_table = gscps2_device_tbl, 444 .id_table = gscps2_device_tbl,
445 .probe = gscps2_probe, 445 .probe = gscps2_probe,
446 .remove = gscps2_remove, 446 .remove = __exit_p(gscps2_remove),
447}; 447};
448 448
449static int __init gscps2_init(void) 449static int __init gscps2_init(void)
diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c
index 1bfdae4b0d99..8eef6849d066 100644
--- a/drivers/input/serio/hp_sdc.c
+++ b/drivers/input/serio/hp_sdc.c
@@ -805,7 +805,7 @@ static void hp_sdc_kicker(unsigned long data)
805 805
806#if defined(__hppa__) 806#if defined(__hppa__)
807 807
808static const struct parisc_device_id hp_sdc_tbl[] = { 808static const struct parisc_device_id hp_sdc_tbl[] __initconst = {
809 { 809 {
810 .hw_type = HPHW_FIO, 810 .hw_type = HPHW_FIO,
811 .hversion_rev = HVERSION_REV_ANY_ID, 811 .hversion_rev = HVERSION_REV_ANY_ID,
@@ -820,7 +820,7 @@ MODULE_DEVICE_TABLE(parisc, hp_sdc_tbl);
820static int __init hp_sdc_init_hppa(struct parisc_device *d); 820static int __init hp_sdc_init_hppa(struct parisc_device *d);
821static struct delayed_work moduleloader_work; 821static struct delayed_work moduleloader_work;
822 822
823static struct parisc_driver hp_sdc_driver = { 823static struct parisc_driver hp_sdc_driver __refdata = {
824 .name = "hp_sdc", 824 .name = "hp_sdc",
825 .id_table = hp_sdc_tbl, 825 .id_table = hp_sdc_tbl,
826 .probe = hp_sdc_init_hppa, 826 .probe = hp_sdc_init_hppa,