Federer returns in Madrid