Commit 2ec678d1 authored by Jens Taprogge's avatar Jens Taprogge Committed by Greg Kroah-Hartman
Browse files

staging: ipack/devices/ipoctal: obtain model from dev->id_device. 



By doing so we can remove ipoctal_check_model() and we also no longer need
to map the IPACK_ID_SPACE.

Signed-off-by: default avatarJens Taprogge <jens.taprogge@taprogge.org>
Signed-off-by: default avatarSamuel Iglesias Gonsalvez <siglesias@igalia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 295beb71

drivers/staging/ipack/devices/ipoctal.c

+2 −44
Original line number Diff line number Diff line
@@ -258,29 +258,6 @@ static irqreturn_t ipoctal_irq_handler(void *arg) 
	return IRQ_HANDLED;

}



static int ipoctal_check_model(struct ipack_device *dev, unsigned char *id)

{

	unsigned char manufacturerID;

	unsigned char board_id;





	manufacturerID = ioread8(dev->id_space.address + IPACK_IDPROM_OFFSET_MANUFACTURER_ID);

	if (manufacturerID != IPACK1_VENDOR_ID_SBS)

		return -ENODEV;

	board_id = ioread8(dev->id_space.address + IPACK_IDPROM_OFFSET_MODEL);

	switch (board_id) {

	case IPACK1_DEVICE_ID_SBS_OCTAL_232:

	case IPACK1_DEVICE_ID_SBS_OCTAL_422:

	case IPACK1_DEVICE_ID_SBS_OCTAL_485:

		*id = board_id;

		break;

	default:

		return -ENODEV;

	}



	return 0;

}



static const struct tty_port_operations ipoctal_tty_port_ops = {

	.dtr_rts = NULL,

	.activate = ipoctal_port_activate,
@@ -293,27 +270,11 @@ static int ipoctal_inst_slot(struct ipoctal *ipoctal, unsigned int bus_nr, 
	int i;

	struct tty_driver *tty;

	char name[20];

	unsigned char board_id;

	struct ipoctal_channel *channel;

	union scc2698_channel __iomem *chan_regs;

	union scc2698_block __iomem *block_regs;



	res = ipoctal->dev->bus->ops->map_space(ipoctal->dev, 0,

						IPACK_ID_SPACE);

	if (res) {

		dev_err(&ipoctal->dev->dev,

			"Unable to map slot [%d:%d] ID space!\n",

			bus_nr, slot);

		return res;

	}



	res = ipoctal_check_model(ipoctal->dev, &board_id);

	if (res) {

		ipoctal->dev->bus->ops->unmap_space(ipoctal->dev,

						    IPACK_ID_SPACE);

		goto out_unregister_id_space;

	}

	ipoctal->board_id = board_id;

	ipoctal->board_id = ipoctal->dev->id_device;



	res = ipoctal->dev->bus->ops->map_space(ipoctal->dev, 0,

						IPACK_IO_SPACE);
@@ -321,7 +282,7 @@ static int ipoctal_inst_slot(struct ipoctal *ipoctal, unsigned int bus_nr, 
		dev_err(&ipoctal->dev->dev,

			"Unable to map slot [%d:%d] IO space!\n",

			bus_nr, slot);

		goto out_unregister_id_space;

		return res;

	}



	res = ipoctal->dev->bus->ops->map_space(ipoctal->dev, 0,
@@ -465,8 +426,6 @@ out_unregister_int_space: 
	ipoctal->dev->bus->ops->unmap_space(ipoctal->dev, IPACK_INT_SPACE);

out_unregister_io_space:

	ipoctal->dev->bus->ops->unmap_space(ipoctal->dev, IPACK_IO_SPACE);

out_unregister_id_space:

	ipoctal->dev->bus->ops->unmap_space(ipoctal->dev, IPACK_ID_SPACE);

	return res;

}
@@ -748,7 +707,6 @@ static void __ipoctal_remove(struct ipoctal *ipoctal) 
	ipoctal->dev->bus->ops->unmap_space(ipoctal->dev, IPACK_MEM_SPACE);

	ipoctal->dev->bus->ops->unmap_space(ipoctal->dev, IPACK_INT_SPACE);

	ipoctal->dev->bus->ops->unmap_space(ipoctal->dev, IPACK_IO_SPACE);

	ipoctal->dev->bus->ops->unmap_space(ipoctal->dev, IPACK_ID_SPACE);

	kfree(ipoctal);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE