Re: [PATCH 8/9] rt2800: add eFuse EEPROM support code to rt2800lib

[Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>]

On Sunday 08 November 2009 19:08:23 Ivo van Doorn wrote:
> On Sunday 08 November 2009, Bartlomiej Zolnierkiewicz wrote:
> > On Sunday 08 November 2009 14:55:59 Ivo van Doorn wrote:
> > > On Sunday 08 November 2009, Bartlomiej Zolnierkiewicz wrote:
> > > > From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
> > > > Subject: [PATCH] rt2800: add eFuse EEPROM support code to rt2800lib
> > > > 
> > > > eFuse EEPROM is used also by USB chips (i.e. RT3070)
> > > > so move the needed code from rt2800pci to rt2800lib.
> > > > 
> > > > Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
> > > > ---
> > > >  drivers/net/wireless/rt2x00/rt2800.h    |   29 +++++++++++++++++++++
> > > >  drivers/net/wireless/rt2x00/rt2800lib.c |   43 ++++++++++++++++++++++++++++++++
> > > >  drivers/net/wireless/rt2x00/rt2800lib.h |    2 +
> > > >  drivers/net/wireless/rt2x00/rt2800pci.c |   38 ++--------------------------
> > > >  drivers/net/wireless/rt2x00/rt2800pci.h |   29 ---------------------
> > > >  5 files changed, 77 insertions(+), 64 deletions(-)
> > > 
> > > 
> > > > ===================================================================
> > > > --- a/drivers/net/wireless/rt2x00/rt2800pci.c
> > > > +++ b/drivers/net/wireless/rt2x00/rt2800pci.c
> > > > @@ -147,44 +147,12 @@ static void rt2800pci_read_eeprom_pci(st
> > > >  
> > > >  static int rt2800pci_efuse_detect(struct rt2x00_dev *rt2x00dev)
> > > >  {
> > > > -	u32 reg;
> > > > -
> > > > -	rt2800_register_read(rt2x00dev, EFUSE_CTRL, &reg);
> > > > -
> > > > -	return rt2x00_get_field32(reg, EFUSE_CTRL_PRESENT);
> > > > +	return rt2800_efuse_detect(rt2x00dev);
> > > >  }
> > > 
> > > It would be better to fix all calls to rt2800pci_efuse_detect to use rt2800_efuse_detect
> > > rather then adding a special wrapper function for it.
> > > 
> > > > -static void rt2800pci_read_eeprom_efuse(struct rt2x00_dev *rt2x00dev)
> > > > +static inline void rt2800pci_read_eeprom_efuse(struct rt2x00_dev *rt2x00dev)
> > > >  {
> > > > -	unsigned int i;
> > > > -
> > > > -	for (i = 0; i < EEPROM_SIZE / sizeof(u16); i += 8)
> > > > -		rt2800pci_efuse_read(rt2x00dev, i);
> > > > +	rt2800_read_eeprom_efuse(rt2x00dev);
> > > >  }
> > > 
> > > Same here.
> > 
> > Could you please explain some more what do you mean by that?
> > (Please note that we have an extra SOC handling in rt2800pci.c.)
> 
> Your changes made the following 2 functions:
> 
> int rt2800pci_efuse_detect(struct rt2x00_dev *rt2x00dev)
> {
> 	return rt2800_efuse_detect(rt2x00dev);
> }
> 
> void rt2800pci_read_eeprom_efuse(struct rt2x00_dev *rt2x00dev)
> {
> 	rt2800_read_eeprom_efuse(rt2x00dev);
> }
> 
> So why do we need rt2800pci_* versions in this case? They simply wrap
> the rt2800 library function without providing anything extra...

Please go read the original code..

#ifdef CONFIG_RT2800PCI_PCI
...
[ the code quoted in your mail ]
...
#else
static inline void rt2800pci_read_eeprom_pci(struct rt2x00_dev *rt2x00dev)
{
}

static inline void rt2800pci_read_eeprom_efuse(struct rt2x00_dev *rt2x00dev)
{
}
#endif /* CONFIG_RT2800PCI_PCI */

[ #else is for CONFIG_RT2800PCI_WISOC ]

-- 
Bartlomiej Zolnierkiewicz