| Message ID | 1589202785-6174-1-git-send-email-pthombar@cadence.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | I3C mastership handover support | expand |
On Mon, 11 May 2020 15:13:05 +0200 Parshuram Thombare <pthombar@cadence.com> wrote: > Removed last argument 'secondary' and refactored > i3c_master_register to move code that can be common > to i3c_secondary_master_register to separate function > i3c_master_init. > > Signed-off-by: Parshuram Thombare <pthombar@cadence.com> > --- > drivers/i3c/master.c | 69 +++++++++++++++++----------- > drivers/i3c/master/dw-i3c-master.c | 2 +- > drivers/i3c/master/i3c-master-cdns.c | 2 +- > include/linux/i3c/master.h | 3 +- > 4 files changed, 46 insertions(+), 30 deletions(-) > > diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c > index 5f4bd52121fe..ba07a7d49633 100644 > --- a/drivers/i3c/master.c > +++ b/drivers/i3c/master.c > @@ -2391,31 +2391,10 @@ static int i3c_master_check_ops(const struct i3c_master_controller_ops *ops) > return 0; > } > > -/** > - * i3c_master_register() - register an I3C master > - * @master: master used to send frames on the bus > - * @parent: the parent device (the one that provides this I3C master > - * controller) > - * @ops: the master controller operations > - * @secondary: true if you are registering a secondary master. Will return > - * -ENOTSUPP if set to true since secondary masters are not yet > - * supported > - * > - * This function takes care of everything for you: > - * > - * - creates and initializes the I3C bus > - * - populates the bus with static I2C devs if @parent->of_node is not > - * NULL > - * - registers all I3C devices added by the controller during bus > - * initialization > - * - registers the I2C adapter and all I2C devices > - * > - * Return: 0 in case of success, a negative error code otherwise. > - */ > -int i3c_master_register(struct i3c_master_controller *master, > - struct device *parent, > - const struct i3c_master_controller_ops *ops, > - bool secondary) > +static int i3c_master_init(struct i3c_master_controller *master, > + struct device *parent, > + const struct i3c_master_controller_ops *ops, > + bool secondary) > { > struct i3c_bus *i3cbus = i3c_master_get_bus(master); > enum i3c_bus_mode mode = I3C_BUS_MODE_PURE; > @@ -2482,6 +2461,45 @@ int i3c_master_register(struct i3c_master_controller *master, > if (ret) > goto err_put_dev; > > + return 0; > + > +err_put_dev: > + put_device(&master->dev); > + > + return ret; > +} > + > +/** > + * i3c_master_register() - register an I3C master The function should be renamed and the doc updated to reflect the fact that it only works for primary masters: i3c_primary_master_register() - register a primary I3C master > + * @master: master used to send frames on the bus > + * @parent: the parent device (the one that provides this I3C master > + * controller) > + * @ops: the master controller operations > + * @secondary: true if you are registering a secondary master. Will return > + * -ENOTSUPP if set to true since secondary masters are not yet > + * supported This argument no longer exists. > + * > + * This function takes care of everything for you: > + * > + * - creates and initializes the I3C bus > + * - populates the bus with static I2C devs if @parent->of_node is not > + * NULL > + * - registers all I3C devices added by the controller during bus > + * initialization > + * - registers the I2C adapter and all I2C devices > + * > + * Return: 0 in case of success, a negative error code otherwise. > + */ > +int i3c_master_register(struct i3c_master_controller *master, > + struct device *parent, > + const struct i3c_master_controller_ops *ops) > +{ > + int ret; > + > + ret = i3c_master_init(master, parent, ops, false); > + if (ret) > + return ret; > + > ret = device_add(&master->dev); > if (ret) > goto err_cleanup_bus; > @@ -2511,7 +2529,6 @@ int i3c_master_register(struct i3c_master_controller *master, > err_cleanup_bus: > i3c_master_bus_cleanup(master); > > -err_put_dev: > put_device(&master->dev); > > return ret; > diff --git a/drivers/i3c/master/dw-i3c-master.c b/drivers/i3c/master/dw-i3c-master.c > index 1d83c97431c7..5d5a8a90ec06 100644 > --- a/drivers/i3c/master/dw-i3c-master.c > +++ b/drivers/i3c/master/dw-i3c-master.c > @@ -1158,7 +1158,7 @@ static int dw_i3c_probe(struct platform_device *pdev) > master->free_pos = GENMASK(master->maxdevs - 1, 0); > > ret = i3c_master_register(&master->base, &pdev->dev, > - &dw_mipi_i3c_ops, false); > + &dw_mipi_i3c_ops); > if (ret) > goto err_assert_rst; > > diff --git a/drivers/i3c/master/i3c-master-cdns.c b/drivers/i3c/master/i3c-master-cdns.c > index 8889a4fdb454..ed4f43807f9e 100644 > --- a/drivers/i3c/master/i3c-master-cdns.c > +++ b/drivers/i3c/master/i3c-master-cdns.c > @@ -1615,7 +1615,7 @@ static int cdns_i3c_master_probe(struct platform_device *pdev) > writel(DEVS_CTRL_DEV_CLR_ALL, master->regs + DEVS_CTRL); > > ret = i3c_master_register(&master->base, &pdev->dev, > - &cdns_i3c_master_ops, false); > + &cdns_i3c_master_ops); > if (ret) > goto err_disable_sysclk; > > diff --git a/include/linux/i3c/master.h b/include/linux/i3c/master.h > index f13fd8b1dd79..f5ba82c390bc 100644 > --- a/include/linux/i3c/master.h > +++ b/include/linux/i3c/master.h > @@ -533,8 +533,7 @@ int i3c_master_set_info(struct i3c_master_controller *master, > > int i3c_master_register(struct i3c_master_controller *master, > struct device *parent, > - const struct i3c_master_controller_ops *ops, > - bool secondary); > + const struct i3c_master_controller_ops *ops); > int i3c_master_unregister(struct i3c_master_controller *master); > > /**
>> +/** >> + * i3c_master_register() - register an I3C master > >The function should be renamed and the doc updated to reflect the fact >that it only works for primary masters: > >i3c_primary_master_register() - register a primary I3C master Sure, I will do that. >> + * @master: master used to send frames on the bus >> + * @parent: the parent device (the one that provides this I3C master >> + * controller) >> + * @ops: the master controller operations >> + * @secondary: true if you are registering a secondary master. Will return >> + * -ENOTSUPP if set to true since secondary masters are not yet >> + * supported > >This argument no longer exists. Thanks, I missed that comment. It should be removed. Regards, Parshuram Thombare
diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c index 5f4bd52121fe..ba07a7d49633 100644 --- a/drivers/i3c/master.c +++ b/drivers/i3c/master.c @@ -2391,31 +2391,10 @@ static int i3c_master_check_ops(const struct i3c_master_controller_ops *ops) return 0; } -/** - * i3c_master_register() - register an I3C master - * @master: master used to send frames on the bus - * @parent: the parent device (the one that provides this I3C master - * controller) - * @ops: the master controller operations - * @secondary: true if you are registering a secondary master. Will return - * -ENOTSUPP if set to true since secondary masters are not yet - * supported - * - * This function takes care of everything for you: - * - * - creates and initializes the I3C bus - * - populates the bus with static I2C devs if @parent->of_node is not - * NULL - * - registers all I3C devices added by the controller during bus - * initialization - * - registers the I2C adapter and all I2C devices - * - * Return: 0 in case of success, a negative error code otherwise. - */ -int i3c_master_register(struct i3c_master_controller *master, - struct device *parent, - const struct i3c_master_controller_ops *ops, - bool secondary) +static int i3c_master_init(struct i3c_master_controller *master, + struct device *parent, + const struct i3c_master_controller_ops *ops, + bool secondary) { struct i3c_bus *i3cbus = i3c_master_get_bus(master); enum i3c_bus_mode mode = I3C_BUS_MODE_PURE; @@ -2482,6 +2461,45 @@ int i3c_master_register(struct i3c_master_controller *master, if (ret) goto err_put_dev; + return 0; + +err_put_dev: + put_device(&master->dev); + + return ret; +} + +/** + * i3c_master_register() - register an I3C master + * @master: master used to send frames on the bus + * @parent: the parent device (the one that provides this I3C master + * controller) + * @ops: the master controller operations + * @secondary: true if you are registering a secondary master. Will return + * -ENOTSUPP if set to true since secondary masters are not yet + * supported + * + * This function takes care of everything for you: + * + * - creates and initializes the I3C bus + * - populates the bus with static I2C devs if @parent->of_node is not + * NULL + * - registers all I3C devices added by the controller during bus + * initialization + * - registers the I2C adapter and all I2C devices + * + * Return: 0 in case of success, a negative error code otherwise. + */ +int i3c_master_register(struct i3c_master_controller *master, + struct device *parent, + const struct i3c_master_controller_ops *ops) +{ + int ret; + + ret = i3c_master_init(master, parent, ops, false); + if (ret) + return ret; + ret = device_add(&master->dev); if (ret) goto err_cleanup_bus; @@ -2511,7 +2529,6 @@ int i3c_master_register(struct i3c_master_controller *master, err_cleanup_bus: i3c_master_bus_cleanup(master); -err_put_dev: put_device(&master->dev); return ret; diff --git a/drivers/i3c/master/dw-i3c-master.c b/drivers/i3c/master/dw-i3c-master.c index 1d83c97431c7..5d5a8a90ec06 100644 --- a/drivers/i3c/master/dw-i3c-master.c +++ b/drivers/i3c/master/dw-i3c-master.c @@ -1158,7 +1158,7 @@ static int dw_i3c_probe(struct platform_device *pdev) master->free_pos = GENMASK(master->maxdevs - 1, 0); ret = i3c_master_register(&master->base, &pdev->dev, - &dw_mipi_i3c_ops, false); + &dw_mipi_i3c_ops); if (ret) goto err_assert_rst; diff --git a/drivers/i3c/master/i3c-master-cdns.c b/drivers/i3c/master/i3c-master-cdns.c index 8889a4fdb454..ed4f43807f9e 100644 --- a/drivers/i3c/master/i3c-master-cdns.c +++ b/drivers/i3c/master/i3c-master-cdns.c @@ -1615,7 +1615,7 @@ static int cdns_i3c_master_probe(struct platform_device *pdev) writel(DEVS_CTRL_DEV_CLR_ALL, master->regs + DEVS_CTRL); ret = i3c_master_register(&master->base, &pdev->dev, - &cdns_i3c_master_ops, false); + &cdns_i3c_master_ops); if (ret) goto err_disable_sysclk; diff --git a/include/linux/i3c/master.h b/include/linux/i3c/master.h index f13fd8b1dd79..f5ba82c390bc 100644 --- a/include/linux/i3c/master.h +++ b/include/linux/i3c/master.h @@ -533,8 +533,7 @@ int i3c_master_set_info(struct i3c_master_controller *master, int i3c_master_register(struct i3c_master_controller *master, struct device *parent, - const struct i3c_master_controller_ops *ops, - bool secondary); + const struct i3c_master_controller_ops *ops); int i3c_master_unregister(struct i3c_master_controller *master); /**
Removed last argument 'secondary' and refactored i3c_master_register to move code that can be common to i3c_secondary_master_register to separate function i3c_master_init. Signed-off-by: Parshuram Thombare <pthombar@cadence.com> --- drivers/i3c/master.c | 69 +++++++++++++++++----------- drivers/i3c/master/dw-i3c-master.c | 2 +- drivers/i3c/master/i3c-master-cdns.c | 2 +- include/linux/i3c/master.h | 3 +- 4 files changed, 46 insertions(+), 30 deletions(-)