Skip to content

Commit 1086210

Browse files
ukleinekgregkh
authored andcommitted
i2c: fsi: Convert to fsi bus probe mechanism
The fsi bus got a dedicated probe function. Make use of that. This fixes a runtime warning about the driver needing to be converted to the bus probe method. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com> Reviewed-by: Andi Shyti <andi.shyti@kernel.org> Acked-by: Eddie James <eajames@linux.ibm.com> Link: https://patch.msgid.link/d8c27aed45bf3119c08c9772768d675ae2ccc0c3.1765279318.git.u.kleine-koenig@baylibre.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 0d295b1 commit 1086210

1 file changed

Lines changed: 7 additions & 8 deletions

File tree

drivers/i2c/busses/i2c-fsi.c

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -674,8 +674,9 @@ static struct device_node *fsi_i2c_find_port_of_node(struct device_node *fsi,
674674
return NULL;
675675
}
676676

677-
static int fsi_i2c_probe(struct device *dev)
677+
static int fsi_i2c_probe(struct fsi_device *fsi_dev)
678678
{
679+
struct device *dev = &fsi_dev->dev;
679680
struct fsi_i2c_ctrl *i2c;
680681
struct fsi_i2c_port *port;
681682
struct device_node *np;
@@ -735,23 +736,21 @@ static int fsi_i2c_probe(struct device *dev)
735736
list_add(&port->list, &i2c->ports);
736737
}
737738

738-
dev_set_drvdata(dev, i2c);
739+
fsi_set_drvdata(fsi_dev, i2c);
739740

740741
return 0;
741742
}
742743

743-
static int fsi_i2c_remove(struct device *dev)
744+
static void fsi_i2c_remove(struct fsi_device *fsi_dev)
744745
{
745-
struct fsi_i2c_ctrl *i2c = dev_get_drvdata(dev);
746+
struct fsi_i2c_ctrl *i2c = fsi_get_drvdata(fsi_dev);
746747
struct fsi_i2c_port *port, *tmp;
747748

748749
list_for_each_entry_safe(port, tmp, &i2c->ports, list) {
749750
list_del(&port->list);
750751
i2c_del_adapter(&port->adapter);
751752
kfree(port);
752753
}
753-
754-
return 0;
755754
}
756755

757756
static const struct fsi_device_id fsi_i2c_ids[] = {
@@ -761,10 +760,10 @@ static const struct fsi_device_id fsi_i2c_ids[] = {
761760

762761
static struct fsi_driver fsi_i2c_driver = {
763762
.id_table = fsi_i2c_ids,
763+
.probe = fsi_i2c_probe,
764+
.remove = fsi_i2c_remove,
764765
.drv = {
765766
.name = "i2c-fsi",
766-
.probe = fsi_i2c_probe,
767-
.remove = fsi_i2c_remove,
768767
},
769768
};
770769

0 commit comments

Comments
 (0)