[PATCH 53/70] mxser: alloc only needed # of ports

From: Jiri Slaby
Date: Fri Jun 18 2021 - 02:19:14 EST


Many boards have only 2 ports. But we always allocate 8 ports (struct
mxser_port) in each struct mxser_board.

Switch this to an empty/variable sized array ([]) and allocate the
needed number of ports using struct_size helper in ->probe.

Signed-off-by: Jiri Slaby <jslaby@xxxxxxx>
---
drivers/tty/mxser.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c
index 0e99225e260f..81e2b72fca3f 100644
--- a/drivers/tty/mxser.c
+++ b/drivers/tty/mxser.c
@@ -275,7 +275,7 @@ struct mxser_board {
enum mxser_must_hwid must_hwid;
speed_t max_baud;

- struct mxser_port ports[MXSER_PORTS_PER_BOARD];
+ struct mxser_port ports[];
};

static DECLARE_BITMAP(mxser_boards, MXSER_BOARDS);
@@ -1923,7 +1923,8 @@ static int mxser_probe(struct pci_dev *pdev,
goto err;
}

- brd = devm_kzalloc(&pdev->dev, sizeof(*brd), GFP_KERNEL);
+ brd = devm_kzalloc(&pdev->dev, struct_size(brd, ports, nports),
+ GFP_KERNEL);
if (!brd)
goto err;

--
2.32.0