Bug fix for AM5 new firmware motherboards (DSDT-FIX)

[yandong31]

 Method (_ON, 0, NotSerialized)  // _ON_: Power On
            {
                M000 (0x30D0)
                M460 ("  OEM-ASL-\\_SB.PCI0.GPP1.P0NV._ON\n", Zero, Zero, Zero, Zero, Zero, Zero)
                Store (G017, Local0)
                Store (0x02, Local2)
                Store (\PWGS (Zero), Local5)
                M460 ("  OEM-ASL-\\_SB.PCI0.GPP1.P0NV._ON D3Cold = 0x%X WD3C First = 0x%X SI3V = 0x%X\n", Local0, WD3C, Local5, Zero, Zero, Zero)
                If (LEqual (Local0, One))
                {
                    PWEN ()
                }

                If (LOr (LEqual (WD3C, One), LEqual (Local5, Zero)))
                {
                    RPCF ()
                    Sleep (0x0A)
                    If (CondRefOf (\UPWD))
                    {
                        \UPWD ()
                    }

                    Store (Zero, WD3C)
                }

                Store (One, D0NV)
                M000 (0x30D1)
            }

Given that the variables G000 to G020 and three methods have been deleted in the cpvs section previously，Is it correct to modify this code as follows?

            Method (_ON, 0, NotSerialized)  // _ON_: Power On
            {
                M000 (0x30D0)
                M460 ("  OEM-ASL-\\_SB.PCI0.GPP1.P0NV._ON\n", Zero, Zero, Zero, Zero, Zero, Zero)
                Store (0x02, Local2)

                If (LEqual (WD3C, One))
                {
                    RPCF ()
                    Sleep (0x0A)
                    Store (Zero, WD3C)
                }

                Store (One, D0NV)
                M000 (0x30D1)
            }