Daniel Ricciardo's underwhelming time at McLaren will end after the 2022 Formula One season and a year before the Australian's contract had been due to expire, both parties said on Wednesday.