Hi Bart, here's the ide_atapi_pc unification series. It all went pretty smoothly along the search & replace line. Using driver-specific members in ide_atapi_pc like idefloppy_callback and idetape_callback is kinda dumb but this approach seemed the fastest versus unnecessary callback function signature change that will touch stuff all over the place. Besides, ide-tape might be gone soon so that would alleviate the problem. On a different note, i noticed ide-scsi might also need a cleanup similar to the other drivers. It is next on my TODO list in case you don't have anything with a higher prio. drivers/ide/ide-floppy.c | 205 +++++++++++++++++-------------------- drivers/ide/ide-tape.c | 251 +++++++++++++++++++++------------------------- drivers/scsi/ide-scsi.c | 133 +++++++++++------------- include/linux/ide.h | 47 +++++++++ 4 files changed, 316 insertions(+), 320 deletions(-) -- Thanks, Boris. - To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html