Skip to content

Commit 573e29c

Browse files
ukleinekgregkh
authored andcommitted
fsi: master: 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/17686d71b4ad3f7ebb63e92453273095a5dd09ea.1765279318.git.u.kleine-koenig@baylibre.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent ec93d2e commit 573e29c

1 file changed

Lines changed: 7 additions & 9 deletions

File tree

drivers/fsi/fsi-master-hub.c

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,9 @@ static int hub_master_init(struct fsi_master_hub *hub)
192192
return fsi_device_write(dev, FSI_MRESB0, &reg, sizeof(reg));
193193
}
194194

195-
static int hub_master_probe(struct device *dev)
195+
static int hub_master_probe(struct fsi_device *fsi_dev)
196196
{
197-
struct fsi_device *fsi_dev = to_fsi_dev(dev);
197+
struct device *dev = &fsi_dev->dev;
198198
struct fsi_master_hub *hub;
199199
uint32_t reg, links;
200200
__be32 __reg;
@@ -235,7 +235,7 @@ static int hub_master_probe(struct device *dev)
235235
hub->master.send_break = hub_master_break;
236236
hub->master.link_enable = hub_master_link_enable;
237237

238-
dev_set_drvdata(dev, hub);
238+
fsi_set_drvdata(fsi_dev, hub);
239239

240240
hub_master_init(hub);
241241

@@ -259,9 +259,9 @@ static int hub_master_probe(struct device *dev)
259259
return rc;
260260
}
261261

262-
static int hub_master_remove(struct device *dev)
262+
static void hub_master_remove(struct fsi_device *fsi_dev)
263263
{
264-
struct fsi_master_hub *hub = dev_get_drvdata(dev);
264+
struct fsi_master_hub *hub = fsi_get_drvdata(fsi_dev);
265265

266266
fsi_master_unregister(&hub->master);
267267
fsi_slave_release_range(hub->upstream->slave, hub->addr, hub->size);
@@ -272,8 +272,6 @@ static int hub_master_remove(struct device *dev)
272272
* the hub
273273
*/
274274
put_device(&hub->master.dev);
275-
276-
return 0;
277275
}
278276

279277
static const struct fsi_device_id hub_master_ids[] = {
@@ -286,10 +284,10 @@ static const struct fsi_device_id hub_master_ids[] = {
286284

287285
static struct fsi_driver hub_master_driver = {
288286
.id_table = hub_master_ids,
287+
.probe = hub_master_probe,
288+
.remove = hub_master_remove,
289289
.drv = {
290290
.name = "fsi-master-hub",
291-
.probe = hub_master_probe,
292-
.remove = hub_master_remove,
293291
}
294292
};
295293

0 commit comments

Comments
 (0)