Merge "qca: Modify kstrtoint() function"