> +//ISP24xx C++ comments again. > /* Load mailbox registers. */ > - optr = (uint16_t __iomem *)MAILBOX_REG(ha, reg, 0); > + if (IS_QLA24XX(ha) || IS_QLA25XX(ha)) { > + reg24 = (struct device_reg_24xx __iomem *)ha->iobase; > + optr = (uint16_t __iomem *)®24->mailbox0; > + } else { > + reg = ha->iobase; > + optr = (uint16_t __iomem *)MAILBOX_REG(ha, reg, 0); > + } Looking over the patches you have things like this a lot, and it's ugly as hell. There must be a nicer way to get all this sorted out. As a start make the ha->iobase and union of the both different register laouts, dito for the reg variable in all the functions, then make sure MAILBOX_REG & co work for the 24xx and 25xx aswell. - : send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html