On 24/03/2016 10:24, Pavel Butsykin wrote: >> For extra points, make ide_handle_rw_error convert IDE_DMA_* to >> IDE_RETRY_* so that the callers only need to pass in IDE_RETRY_DMA >> > You mean to do something like that: > > ide_handle_rw_error(s, -ret, s->dma_cmd | IDE_RETRY_DMA)
Just ide_handle_rw_error(s, -ret, IDE_RETRY_DMA) and in ide_handle_rw_error if (op == IDE_RETRY_DMA) { if (s->dma_cmd == IDE_DMA_READ) op |= IDE_RETRY_READ; else if (s->dma_cmd == IDE_DMA_TRIM) op |= IDE_RETRY_TRIM; } But I'm not sure anymore this is a good idea. However, if it works, using dma_cmd would be better than using the dma_cb. Paolo