diff options
| author | Jiri Slaby <jirislaby@gmail.com> | 2008-02-07 03:16:43 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 11:42:34 -0500 |
| commit | 0ecd233bb6efa9745dffc6134ceab8aba1aa030b (patch) | |
| tree | 70055ce3f35b113bf7cb8a118c728badcc939b65 | |
| parent | c3667d5c321ac2211d04a746f91a48d339a0e0a1 (diff) | |
Char: mxser, reorder mxser_cardinfo fields
Reorder fields to save some memory and code on 64bit due to alignment as
suggested by Jan.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Jan Engelhardt <jengelh@computergmbh.de>
Reviewed-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/char/mxser_new.c | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/drivers/char/mxser_new.c b/drivers/char/mxser_new.c index d2dcc546cc75..9449fba80faa 100644 --- a/drivers/char/mxser_new.c +++ b/drivers/char/mxser_new.c | |||
| @@ -106,41 +106,41 @@ static const struct { | |||
| 106 | #define UART_INFO_NUM ARRAY_SIZE(Gpci_uart_info) | 106 | #define UART_INFO_NUM ARRAY_SIZE(Gpci_uart_info) |
| 107 | 107 | ||
| 108 | struct mxser_cardinfo { | 108 | struct mxser_cardinfo { |
| 109 | unsigned int nports; | ||
| 110 | char *name; | 109 | char *name; |
| 110 | unsigned int nports; | ||
| 111 | unsigned int flags; | 111 | unsigned int flags; |
| 112 | }; | 112 | }; |
| 113 | 113 | ||
| 114 | static const struct mxser_cardinfo mxser_cards[] = { | 114 | static const struct mxser_cardinfo mxser_cards[] = { |
| 115 | /* 0*/ { 8, "C168 series", }, | 115 | /* 0*/ { "C168 series", 8, }, |
| 116 | { 4, "C104 series", }, | 116 | { "C104 series", 4, }, |
| 117 | { 4, "CI-104J series", }, | 117 | { "CI-104J series", 4, }, |
| 118 | { 8, "C168H/PCI series", }, | 118 | { "C168H/PCI series", 8, }, |
| 119 | { 4, "C104H/PCI series", }, | 119 | { "C104H/PCI series", 4, }, |
| 120 | /* 5*/ { 4, "C102 series", MXSER_HAS2 }, /* C102-ISA */ | 120 | /* 5*/ { "C102 series", 4, MXSER_HAS2 }, /* C102-ISA */ |
| 121 | { 4, "CI-132 series", MXSER_HAS2 }, | 121 | { "CI-132 series", 4, MXSER_HAS2 }, |
| 122 | { 4, "CI-134 series", }, | 122 | { "CI-134 series", 4, }, |
| 123 | { 2, "CP-132 series", }, | 123 | { "CP-132 series", 2, }, |
| 124 | { 4, "CP-114 series", }, | 124 | { "CP-114 series", 4, }, |
| 125 | /*10*/ { 4, "CT-114 series", }, | 125 | /*10*/ { "CT-114 series", 4, }, |
| 126 | { 2, "CP-102 series", MXSER_HIGHBAUD }, | 126 | { "CP-102 series", 2, MXSER_HIGHBAUD }, |
| 127 | { 4, "CP-104U series", }, | 127 | { "CP-104U series", 4, }, |
| 128 | { 8, "CP-168U series", }, | 128 | { "CP-168U series", 8, }, |
| 129 | { 2, "CP-132U series", }, | 129 | { "CP-132U series", 2, }, |
| 130 | /*15*/ { 4, "CP-134U series", }, | 130 | /*15*/ { "CP-134U series", 4, }, |
| 131 | { 4, "CP-104JU series", }, | 131 | { "CP-104JU series", 4, }, |
| 132 | { 8, "Moxa UC7000 Serial", }, /* RC7000 */ | 132 | { "Moxa UC7000 Serial", 8, }, /* RC7000 */ |
| 133 | { 8, "CP-118U series", }, | 133 | { "CP-118U series", 8, }, |
| 134 | { 2, "CP-102UL series", }, | 134 | { "CP-102UL series", 2, }, |
| 135 | /*20*/ { 2, "CP-102U series", }, | 135 | /*20*/ { "CP-102U series", 2, }, |
| 136 | { 8, "CP-118EL series", }, | 136 | { "CP-118EL series", 8, }, |
| 137 | { 8, "CP-168EL series", }, | 137 | { "CP-168EL series", 8, }, |
| 138 | { 4, "CP-104EL series", }, | 138 | { "CP-104EL series", 4, }, |
| 139 | { 8, "CB-108 series", }, | 139 | { "CB-108 series", 8, }, |
| 140 | /*25*/ { 4, "CB-114 series", }, | 140 | /*25*/ { "CB-114 series", 4, }, |
| 141 | { 4, "CB-134I series", }, | 141 | { "CB-134I series", 4, }, |
| 142 | { 8, "CP-138U series", }, | 142 | { "CP-138U series", 8, }, |
| 143 | { 4, "POS-104UL series", } | 143 | { "POS-104UL series", 4, } |
| 144 | }; | 144 | }; |
| 145 | 145 | ||
| 146 | /* driver_data correspond to the lines in the structure above | 146 | /* driver_data correspond to the lines in the structure above |