>> @@ -683,13 +683,10 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev, >> reg_crq_cleanup: >> dma_unmap_single(dev, ibmvtpm->crq_dma_handle, >> CRQ_RES_BUF_SIZE, DMA_BIDIRECTIONAL); >> -cleanup: >> - if (ibmvtpm) { >> - if (crq_q->crq_addr) >> - free_page((unsigned long)crq_q->crq_addr); >> - kfree(ibmvtpm); >> - } >> - > > I think a single cleanup section is better than many labels that just > avoid a single null check. I proposed to delete two unnecessary condition checks together with an adjustment of jump targets. Regards, Markus