| Message ID | 1385604693.1586.76.camel@bwh-desktop.uk.level5networks.com |
|---|---|
| State | Superseded, archived |
| Delegated to: | David Miller |
| Headers | show |
On 11/27/2013 06:11 PM, Ben Hutchings wrote: > On Tue, 2013-11-26 at 19:33 -0800, Guenter Roeck wrote: >> Simplify the code. Avoid race conditions caused by attributes >> being created after hwmon device registration. Implicitly >> (through hwmon API) add mandatory 'name' sysfs attribute. >> >> Signed-off-by: Guenter Roeck <linux@roeck-us.net> >> --- >> Compile tested only. > [...] > > Very close, but you missed this bit: > > --- a/drivers/net/ethernet/sfc/mcdi_mon.c > +++ b/drivers/net/ethernet/sfc/mcdi_mon.c > @@ -142,7 +142,7 @@ static int efx_mcdi_mon_update(struct efx_nic *efx) > static int efx_mcdi_mon_get_entry(struct device *dev, unsigned int index, > efx_dword_t *entry) > { > - struct efx_nic *efx = dev_get_drvdata(dev); > + struct efx_nic *efx = dev_get_drvdata(dev->parent); > struct efx_mcdi_mon *hwmon = efx_mcdi_mon(efx); > int rc; > > --- > > With that addition, it works for me, and you can add my Reviewed-by. > Thanks a lot! Guenter -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
--- a/drivers/net/ethernet/sfc/mcdi_mon.c +++ b/drivers/net/ethernet/sfc/mcdi_mon.c @@ -142,7 +142,7 @@ static int efx_mcdi_mon_update(struct efx_nic *efx) static int efx_mcdi_mon_get_entry(struct device *dev, unsigned int index, efx_dword_t *entry) { - struct efx_nic *efx = dev_get_drvdata(dev); + struct efx_nic *efx = dev_get_drvdata(dev->parent); struct efx_mcdi_mon *hwmon = efx_mcdi_mon(efx); int rc;