In the file file drivers/staging /emxx_udc/emxx_udc.c every EPn_ type variable should be modified in seperate patches ?

like EPn_BUF_TYPE should be modified as EPN_BUF_TYPE in one patch

and EPn_MPKT as EPN_MPKT in another patch.?