Skip to content

Commit 0cf9580

Browse files
ukleinekgregkh
authored andcommitted
fsi: sbefifo: 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> Acked-by: Eddie James <eajames@linux.ibm.com> Link: https://patch.msgid.link/79dd5a9459f0719b7602165c89eb6fc24815f3b5.1765279318.git.u.kleine-koenig@baylibre.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 573e29c commit 0cf9580

1 file changed

Lines changed: 8 additions & 9 deletions

File tree

drivers/fsi/fsi-sbefifo.c

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,9 +1022,9 @@ static void sbefifo_free(struct device *dev)
10221022
* Probe/remove
10231023
*/
10241024

1025-
static int sbefifo_probe(struct device *dev)
1025+
static int sbefifo_probe(struct fsi_device *fsi_dev)
10261026
{
1027-
struct fsi_device *fsi_dev = to_fsi_dev(dev);
1027+
struct device *dev = &fsi_dev->dev;
10281028
struct sbefifo *sbefifo;
10291029
struct device_node *np;
10301030
struct platform_device *child;
@@ -1045,7 +1045,7 @@ static int sbefifo_probe(struct device *dev)
10451045

10461046
sbefifo->magic = SBEFIFO_MAGIC;
10471047
sbefifo->fsi_dev = fsi_dev;
1048-
dev_set_drvdata(dev, sbefifo);
1048+
fsi_set_drvdata(fsi_dev, sbefifo);
10491049
mutex_init(&sbefifo->lock);
10501050
sbefifo->timeout_in_cmd_ms = SBEFIFO_TIMEOUT_IN_CMD;
10511051
sbefifo->timeout_start_rsp_ms = SBEFIFO_TIMEOUT_START_RSP;
@@ -1101,9 +1101,10 @@ static int sbefifo_unregister_child(struct device *dev, void *data)
11011101
return 0;
11021102
}
11031103

1104-
static int sbefifo_remove(struct device *dev)
1104+
static void sbefifo_remove(struct fsi_device *fsi_dev)
11051105
{
1106-
struct sbefifo *sbefifo = dev_get_drvdata(dev);
1106+
struct device *dev = &fsi_dev->dev;
1107+
struct sbefifo *sbefifo = fsi_get_drvdata(fsi_dev);
11071108

11081109
dev_dbg(dev, "Removing sbefifo device...\n");
11091110

@@ -1117,8 +1118,6 @@ static int sbefifo_remove(struct device *dev)
11171118
fsi_free_minor(sbefifo->dev.devt);
11181119
device_for_each_child(dev, NULL, sbefifo_unregister_child);
11191120
put_device(&sbefifo->dev);
1120-
1121-
return 0;
11221121
}
11231122

11241123
static const struct fsi_device_id sbefifo_ids[] = {
@@ -1131,10 +1130,10 @@ static const struct fsi_device_id sbefifo_ids[] = {
11311130

11321131
static struct fsi_driver sbefifo_drv = {
11331132
.id_table = sbefifo_ids,
1133+
.probe = sbefifo_probe,
1134+
.remove = sbefifo_remove,
11341135
.drv = {
11351136
.name = DEVICE_NAME,
1136-
.probe = sbefifo_probe,
1137-
.remove = sbefifo_remove,
11381137
}
11391138
};
11401139

0 commit comments

Comments
 (0)