On 06/06/2018 04:09 PM, John Snow wrote:
> From: Paolo Bonzini <pbonzini@redhat.com>
>
> The code can simply be moved to the sole caller that has notify == true.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> hw/ide/core.c | 11 ++++-------
> 1 file changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/hw/ide/core.c b/hw/ide/core.c
> index 1a6cb337bf..54799ea6fb 100644
> --- a/hw/ide/core.c
> +++ b/hw/ide/core.c
> @@ -548,26 +548,23 @@ static void ide_cmd_done(IDEState *s)
> }
>
> static void ide_transfer_halt(IDEState *s,
> - void(*end_transfer_func)(IDEState *),
> - bool notify)
> + void(*end_transfer_func)(IDEState *))
> {
> s->end_transfer_func = end_transfer_func;
> s->data_ptr = s->io_buffer;
> s->data_end = s->io_buffer;
> s->status &= ~DRQ_STAT;
> - if (notify) {
> - ide_cmd_done(s);
> - }
> }
>
> void ide_transfer_stop(IDEState *s)
> {
> - ide_transfer_halt(s, ide_transfer_stop, true);
> + ide_transfer_halt(s, ide_transfer_stop);
> + ide_cmd_done(s);
> }
>
> static void ide_transfer_cancel(IDEState *s)
> {
> - ide_transfer_halt(s, ide_transfer_cancel, false);
> + ide_transfer_halt(s, ide_transfer_cancel);
> }
>
> int64_t ide_get_sector(IDEState *s)
>