Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4726abc authored by Stephen Boyd's avatar Stephen Boyd Committed by Lee Jones
Browse files

mfd: intel_quark_i2c_gpio: Use clkdev_create() 



Convert this driver to use clkdev_create() instead of
clk_register_clkdevs(). The latter API is only used by this driver,
although this driver only allocates one clk to add anyway.
Furthermore, this driver allocates the clk_lookup structure with
devm, but clkdev_drop() will free that structure when passed,
leading to a double free when this driver is removed. Clean it
all up and pave the way for the removal of clk_register_clkdevs().

Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 36f90b0a

drivers/mfd/intel_quark_i2c_gpio.c

+9 −17
Original line number Original line Diff line number Diff line
@@ -52,8 +52,6 @@ 
/* The Quark I2C controller source clock */

/* The Quark I2C controller source clock */

#define INTEL_QUARK_I2C_CLK_HZ	33000000

#define INTEL_QUARK_I2C_CLK_HZ	33000000





#define INTEL_QUARK_I2C_NCLK	1



struct intel_quark_mfd {

struct intel_quark_mfd {

	struct pci_dev		*pdev;

	struct pci_dev		*pdev;

	struct clk		*i2c_clk;

	struct clk		*i2c_clk;
@@ -128,30 +126,24 @@ MODULE_DEVICE_TABLE(pci, intel_quark_mfd_ids); 
static int intel_quark_register_i2c_clk(struct intel_quark_mfd *quark_mfd)

static int intel_quark_register_i2c_clk(struct intel_quark_mfd *quark_mfd)

{

{

	struct pci_dev *pdev = quark_mfd->pdev;

	struct pci_dev *pdev = quark_mfd->pdev;

	struct clk_lookup *i2c_clk_lookup;

	struct clk *i2c_clk;

	struct clk *i2c_clk;

	int ret;



	i2c_clk_lookup = devm_kcalloc(&pdev->dev, INTEL_QUARK_I2C_NCLK,

				      sizeof(*i2c_clk_lookup), GFP_KERNEL);

	if (!i2c_clk_lookup)

		return -ENOMEM;



	i2c_clk_lookup[0].dev_id = INTEL_QUARK_I2C_CONTROLLER_CLK;





	i2c_clk = clk_register_fixed_rate(&pdev->dev,

	i2c_clk = clk_register_fixed_rate(&pdev->dev,

					  INTEL_QUARK_I2C_CONTROLLER_CLK, NULL,

					  INTEL_QUARK_I2C_CONTROLLER_CLK, NULL,

					  CLK_IS_ROOT, INTEL_QUARK_I2C_CLK_HZ);

					  CLK_IS_ROOT, INTEL_QUARK_I2C_CLK_HZ);

	if (IS_ERR(i2c_clk))

		return PTR_ERR(i2c_clk);





	quark_mfd->i2c_clk_lookup = i2c_clk_lookup;

	quark_mfd->i2c_clk = i2c_clk;

	quark_mfd->i2c_clk = i2c_clk;

	quark_mfd->i2c_clk_lookup = clkdev_create(i2c_clk, NULL,

						INTEL_QUARK_I2C_CONTROLLER_CLK);





	ret = clk_register_clkdevs(i2c_clk, i2c_clk_lookup,

	if (!quark_mfd->i2c_clk_lookup) {

				   INTEL_QUARK_I2C_NCLK);

		dev_err(&pdev->dev, "Fixed clk register failed\n");

	if (ret)

		return -ENOMEM;

		dev_err(&pdev->dev, "Fixed clk register failed: %d\n", ret);

	}





	return ret;

	return 0;

}

}





static void intel_quark_unregister_i2c_clk(struct pci_dev *pdev)

static void intel_quark_unregister_i2c_clk(struct pci_dev *pdev)