On 07/27/2015 06:38 AM, Matt Fleming wrote:
From: Matt Fleming <matt.flem...@intel.com>Intel Sunrisepoint (Skylake PCH) has the iTCO watchdog accessible across the SMBus, unlike previous generations of PCH/ICH where it was on the LPC bus. Because it's on the SMBus, it doesn't make sense to pass around a 'struct lpc_ich_info', and leaking the type of bus into the iTCO watchdog driver is kind of backwards anyway. This change introduces a new 'struct iTCO_wdt_platform_data' for use inside the iTCO watchdog driver and by the upcoming Intel Sunrisepoint code, which neatly avoids having to include lpc_ich headers in the i801 i2c driver. A simple translation layer is provided for converting from the existing 'struct lpc_ich_info' inside the lpc_ich mfd driver. Cc: Peter Tyser <pty...@xes-inc.com> Cc: Samuel Ortiz <sa...@linux.intel.com> Cc: Lee Jones <lee.jo...@linaro.org> Cc: Wim Van Sebroeck <w...@iguana.be> Signed-off-by: Matt Fleming <matt.flem...@intel.com> --- drivers/mfd/lpc_ich.c | 32 +++++++++++++++++++++++++++++--- drivers/watchdog/Kconfig | 2 +- drivers/watchdog/iTCO_wdt.c | 11 +++++------ include/linux/mfd/lpc_ich.h | 6 ------ include/linux/platform_data/iTCO_wdt.h | 18 ++++++++++++++++++ 5 files changed, 53 insertions(+), 16 deletions(-) create mode 100644 include/linux/platform_data/iTCO_wdt.h diff --git a/drivers/mfd/lpc_ich.c b/drivers/mfd/lpc_ich.c index 8de34398abc0..d190b74a6321 100644 --- a/drivers/mfd/lpc_ich.c +++ b/drivers/mfd/lpc_ich.c @@ -66,6 +66,7 @@ #include <linux/pci.h> #include <linux/mfd/core.h> #include <linux/mfd/lpc_ich.h> +#include <linux/platform_data/iTCO_wdt.h> #define ACPIBASE 0x40 #define ACPIBASE_GPE_OFF 0x28 @@ -835,9 +836,31 @@ static void lpc_ich_enable_pmc_space(struct pci_dev *dev) priv->actrl_pbase_save = reg_save; } -static void lpc_ich_finalize_cell(struct pci_dev *dev, struct mfd_cell *cell) +static int lpc_ich_finalize_wdt_cell(struct pci_dev *dev) { + struct iTCO_wdt_platform_data *pdata; struct lpc_ich_priv *priv = pci_get_drvdata(dev); + struct lpc_ich_info *info; + struct mfd_cell *cell = &lpc_ich_cells[LPC_WDT]; + + pdata = kzalloc(sizeof(*pdata), GFP_KERNEL); + if (!pdata) + return -ENOMEM; +
I don't see the platform data freed anywhere, neither in the error path nor in the cleanup path of this driver. Can you use devm_kzalloc() ? Otherwise I think you'll need a cleanup path. Guenter -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
