diff options
author | Helge Deller <deller@gmx.de> | 2017-08-21 15:55:11 -0400 |
---|---|---|
committer | Helge Deller <deller@gmx.de> | 2017-08-22 10:34:35 -0400 |
commit | fc72b7a3a0d893576afb19b4f38c1d6160e9753b (patch) | |
tree | 21bf36d5e21f8b0bef0bd12437654749b5da88c4 | |
parent | 6aaf7934cfcd3884c852ad88559c228a53b413f7 (diff) |
parisc/mux: Fix section mismatches
Signed-off-by: Helge Deller <deller@gmx.de>
-rw-r--r-- | drivers/tty/serial/mux.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/tty/serial/mux.c b/drivers/tty/serial/mux.c index 8a4be4b73723..6f14d2a547c4 100644 --- a/drivers/tty/serial/mux.c +++ b/drivers/tty/serial/mux.c | |||
@@ -503,7 +503,7 @@ static int __init mux_probe(struct parisc_device *dev) | |||
503 | return 0; | 503 | return 0; |
504 | } | 504 | } |
505 | 505 | ||
506 | static int mux_remove(struct parisc_device *dev) | 506 | static int __exit mux_remove(struct parisc_device *dev) |
507 | { | 507 | { |
508 | int i, j; | 508 | int i, j; |
509 | int port_count = (long)dev_get_drvdata(&dev->dev); | 509 | int port_count = (long)dev_get_drvdata(&dev->dev); |
@@ -536,13 +536,13 @@ static int mux_remove(struct parisc_device *dev) | |||
536 | * This table only contains the parisc_device_id of known builtin mux | 536 | * This table only contains the parisc_device_id of known builtin mux |
537 | * devices. All other mux cards will be detected by the generic mux_tbl. | 537 | * devices. All other mux cards will be detected by the generic mux_tbl. |
538 | */ | 538 | */ |
539 | static struct parisc_device_id builtin_mux_tbl[] = { | 539 | static const struct parisc_device_id builtin_mux_tbl[] __initconst = { |
540 | { HPHW_A_DIRECT, HVERSION_REV_ANY_ID, 0x15, 0x0000D }, /* All K-class */ | 540 | { HPHW_A_DIRECT, HVERSION_REV_ANY_ID, 0x15, 0x0000D }, /* All K-class */ |
541 | { HPHW_A_DIRECT, HVERSION_REV_ANY_ID, 0x44, 0x0000D }, /* E35, E45, and E55 */ | 541 | { HPHW_A_DIRECT, HVERSION_REV_ANY_ID, 0x44, 0x0000D }, /* E35, E45, and E55 */ |
542 | { 0, } | 542 | { 0, } |
543 | }; | 543 | }; |
544 | 544 | ||
545 | static struct parisc_device_id mux_tbl[] = { | 545 | static const struct parisc_device_id mux_tbl[] __initconst = { |
546 | { HPHW_A_DIRECT, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x0000D }, | 546 | { HPHW_A_DIRECT, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x0000D }, |
547 | { 0, } | 547 | { 0, } |
548 | }; | 548 | }; |
@@ -550,18 +550,18 @@ static struct parisc_device_id mux_tbl[] = { | |||
550 | MODULE_DEVICE_TABLE(parisc, builtin_mux_tbl); | 550 | MODULE_DEVICE_TABLE(parisc, builtin_mux_tbl); |
551 | MODULE_DEVICE_TABLE(parisc, mux_tbl); | 551 | MODULE_DEVICE_TABLE(parisc, mux_tbl); |
552 | 552 | ||
553 | static struct parisc_driver builtin_serial_mux_driver = { | 553 | static struct parisc_driver builtin_serial_mux_driver __refdata = { |
554 | .name = "builtin_serial_mux", | 554 | .name = "builtin_serial_mux", |
555 | .id_table = builtin_mux_tbl, | 555 | .id_table = builtin_mux_tbl, |
556 | .probe = mux_probe, | 556 | .probe = mux_probe, |
557 | .remove = mux_remove, | 557 | .remove = __exit_p(mux_remove), |
558 | }; | 558 | }; |
559 | 559 | ||
560 | static struct parisc_driver serial_mux_driver = { | 560 | static struct parisc_driver serial_mux_driver __refdata = { |
561 | .name = "serial_mux", | 561 | .name = "serial_mux", |
562 | .id_table = mux_tbl, | 562 | .id_table = mux_tbl, |
563 | .probe = mux_probe, | 563 | .probe = mux_probe, |
564 | .remove = mux_remove, | 564 | .remove = __exit_p(mux_remove), |
565 | }; | 565 | }; |
566 | 566 | ||
567 | /** | 567 | /** |