Re: linux-next: manual merge of the scsi-mkp tree with the tip tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 887 bytes --]

Hi all,

On Tue, 25 Feb 2025 20:32:28 +0100 Thomas Gleixner <tglx@linutronix.de> wrote:
>
> On Tue, Feb 25 2025 at 09:38, John Garry wrote:
> >
> > static int sdebug_init_cmd_priv(struct Scsi_Host *shost, struct 
> > scsi_cmnd *cmd)
> > {
> > 	struct sdebug_scsi_cmd *sdsc = scsi_cmd_priv(cmd);
> > 	struct sdebug_defer *sd_dp = &sdsc->sd_dp;
> >
> > 	spin_lock_init(&sdsc->lock);
> > 	hrtimer_setup(&sd_dp->hrt, sdebug_q_cmd_hrt_complete, CLOCK_MONOTONIC,
> > 		      HRTIMER_MODE_REL_PINNED);
> > 	sd_dp->hrt.function = sdebug_q_cmd_hrt_complete; ***
> > 	INIT_WORK(&sd_dp->ew.work, sdebug_q_cmd_wq_complete);
> >
> >
> > I guess that setting sd_dp->hrt.function explicitly, at *** above, is 
> > not needed (as hrtimer_setup()) does this.  
> 
> Correct. hrtimer_setup is enough.

Thanks, I have updated my merge resolution.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]