> ... > > > - val = state ? (ret | mask) : (ret & ~mask); > > + val = state ? (ret | mask) : (ret & ~mask); > > I'm wondering if you can prepere the code by introducing switch-case instead of > current implementation in the preparatory patch and then do what you want to do > here. It will show much better the change and make review easier. > Agreed. Diff wasn't being particularly helpful in how it handled the changes here so helping it along with a precursor patch would be good. Jonathan