What is the meaning of discipline?

Self control... Punishment...

A whip used in the practice of self-mortification...

Or an instrument of chastisement...