Merge branch 'pci/controller/mobiveil'

bjorn-helgaas · bjorn-helgaas · commit dee6ce5c6f1d · 2025-06-04T10:50:41.000-05:00
- Use to_delayed_work() instead of open-coding it (Chen Ni)

* pci/controller/mobiveil:
  PCI: ls-gen4: Use to_delayed_work()
diff --git a/drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c b/drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c
@@ -169,8 +169,7 @@ static int ls_g4_pcie_interrupt_init(struct mobiveil_pcie *mv_pci)
 
 static void ls_g4_pcie_reset(struct work_struct *work)
 {
-	struct delayed_work *dwork = container_of(work, struct delayed_work,
-						  work);
+	struct delayed_work *dwork = to_delayed_work(work);
 	struct ls_g4_pcie *pcie = container_of(dwork, struct ls_g4_pcie, dwork);
 	struct mobiveil_pcie *mv_pci = &pcie->pci;
 	u16 ctrl;

Original file line number	Diff line number	Diff line change
`@@ -169,8 +169,7 @@ static int ls_g4_pcie_interrupt_init(struct mobiveil_pcie *mv_pci)`
`169`	`169`
`170`	`170`	`static void ls_g4_pcie_reset(struct work_struct *work)`
`171`	`171`	`{`
`172`		`- struct delayed_work *dwork = container_of(work, struct delayed_work,`
`173`		`- work);`
	`172`	`+ struct delayed_work *dwork = to_delayed_work(work);`
`174`	`173`	`struct ls_g4_pcie *pcie = container_of(dwork, struct ls_g4_pcie, dwork);`
`175`	`174`	`struct mobiveil_pcie *mv_pci = &pcie->pci;`
`176`	`175`	`u16 ctrl;`