More on Entropy Function Formalism for Non-Extremal Branes