On Wed, Oct 02, 2024 at 10:14:10AM -0400, Parker Newman wrote: > From: Parker Newman <pnewman@xxxxxxxxxxxxxxx> > > Remove the old exar_ee_read() and associated helper functions. > Remove defines that are no longer needed after the switch to using the > eeprom_93cx6 driver. > Add CTI_EE_MASK_OSC_FREQ define. Seems like you have a rebase issues (you folded changes to the wrong patch). ... > drivers/tty/serial/8250/8250_exar.c | 95 +---------------------------- > 1 file changed, 2 insertions(+), 93 deletions(-) Shouldn't be + lines here. ... > +#define CTI_EE_MASK_OSC_FREQ GENMASK(31, 0) ... > osc_freq = le16_to_cpu(ee_words[0]) | (le16_to_cpu(ee_words[1]) << 16); > - if (osc_freq == GENMASK(31, 0)) > + if (osc_freq == CTI_EE_MASK_OSC_FREQ) > return -EIO; You just introduced the - variant in the previous patch. So, squash these two changes in the patch that adds this new conditional check. -- With Best Regards, Andy Shevchenko
