Hi! > > I'll really need to make pci_choose_state > > "NOP" in the current code, so that it can be safely added to the > > existing drivers. > > There's no point in adding NOPs. Why bother? > > Remember, the original idea behind pci_choose_state() was that > PCI drivers for PM-aware devices could use that instead of their > own dumb mappings between system suspend states (S0, S1, S2, S3, > S4, etc) and PCI states ... which in too many cases was just to > re-use the same numeric value. That's _never_ going to be a NOP, > unless Linux only ever supports PCI D3hot (ACPI D2) and S3; and > likewise will never be needed for PM-stupid devices, or for those > drivers with actual intelligence (e.g. Ben's video examples). When I added pci_choose_state to drivers, I commented it as "no code changes". I was wrong. pci_choose_state() needs to return d3hot even for pmsg_freeze, because that's what old code did, and I did not audit all the drivers. > My original question is unanswered though: what tree is it that > made these (broken) changes to USB? It's not BK-current, and it's > not the USB tree... suspend2 tree and my personal tree. Pavel -- People were complaining that M$ turns users into beta-testers... ...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!