LGTM.

Inline comments (kib)

This is a fix for regression introduced by D58405

Thanks for looking at this. It will be next week before I can test any changes and put up a new, tested diff. I'm away from home at the moment and don't trust doing a restart remotely. I've managed to get the restart working more often that not (it simply doesn't work by default) but haven't got anything working well enough to publish or trust

Add one missed detach for SR-IOV

Address inline comments

I’ve updated the diff with the review feedback.

@ali_mashtizadeh.com @mhorne @kib Could you please review it again? Thanks!

The alternative format that I prefer that's a bit more explicit is something like:

# Enable ACPI support in driver.
#
# Enables suspend/resume support on x86 machines ...
BRCMFMAC_ACPI?= 0

That way you can document what the knobs do, what models the knobs might affect, etc, and the knobs in and of themselves become self-documenting. Downside is now you need to put the knobs in the KERNCONFs as well as the module Makefiles.
Thoughts?

In D58709#1348972, @avg wrote:

Just a general comment.

This regularization of SI_ORDER and SI_SUB is a very a good improvement.

But based on the descriptions of the changes, it seems that magic numbers (even indirected by magic constants) are not the best way to order dependencies.
Maybe subsystems need the same dependency declaration mechanism that modules have.
Or, perhaps, subsystems can even be defined as some kind of modules.

Just a general comment.