Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 514fb84e authored by Ryan Bradetich's avatar Ryan Bradetich Committed by Kyle McMartin
Browse files

[PARISC] [MUX] Get the hversion directly from the parisc_device 



Willy pointed out the hversion is already stored
in the parisc_device, so I do not need to extract
this information directly from the IODC data.
Also by using the information in the parisc_device
I can avoid re-reading the IODC data for the Muxes
with specifed port counts.

Signed-off-by: default avatarRyan Bradetich <rbrad@parisc-linux.org>
Signed-off-by: default avatarKyle McMartin <kyle@parisc-linux.org>
parent 61425445

drivers/serial/mux.c

+5 −4
Original line number Diff line number Diff line
@@ -83,19 +83,20 @@ static struct timer_list mux_timer; 
 */

static int __init get_mux_port_count(struct parisc_device *dev)

{

	int status;

	u8 iodc_data[32];

	unsigned long bytecnt;



	int status = pdc_iodc_read(&bytecnt, dev->hpa.start, 0, iodc_data, 32);

	BUG_ON(status != PDC_OK);



	/* If this is the built-in Mux for the K-Class (Eole CAP/MUX),

	 * we only need to allocate resources for 1 port since the

	 * other 7 ports are not connected.

	 */

	if(((iodc_data[0] << 4) | ((iodc_data[1] & 0xf0) >> 4)) == 0x15)

	if(dev->id.hversion == 0x15)

		return 1;



	status = pdc_iodc_read(&bytecnt, dev->hpa.start, 0, iodc_data, 32);

	BUG_ON(status != PDC_OK);



	/* Return the number of ports specified in the iodc data. */

	return ((((iodc_data)[4] & 0xf0) >> 4) * 8) + 8;

}