This is mostly trivial whitespace and printk text tweaks.  I did add the
segment number to a printk that previously just had the bus.