LastDevicePathNode = NULL;\r
ZeroMem (&ParentHdDev, sizeof (ParentHdDev));\r
DevicePathNode = DevicePath;\r
- while (!EfiIsDevicePathEnd (DevicePathNode)) {\r
+ while (!IsDevicePathEnd (DevicePathNode)) {\r
LastDevicePathNode = DevicePathNode;\r
- DevicePathNode = EfiNextDevicePathNode (DevicePathNode);\r
+ DevicePathNode = NextDevicePathNode (DevicePathNode);\r
}\r
\r
if (LastDevicePathNode != NULL) {\r