->s_dev is switched to dev_t.  Everything that uses it uses it as
a number - i.e. all instances are either minor() or kdev_t_to_nr().