From 6883fc4378b2d4e438a45a874a424460f58a2db1 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Sun, 26 May 2013 23:02:56 +0200 Subject: ata: implement detect Signed-off-by: Sascha Hauer --- drivers/ata/disk_ata_drive.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) (limited to 'drivers') diff --git a/drivers/ata/disk_ata_drive.c b/drivers/ata/disk_ata_drive.c index 034233d184..7669539485 100644 --- a/drivers/ata/disk_ata_drive.c +++ b/drivers/ata/disk_ata_drive.c @@ -281,14 +281,10 @@ on_error: return rc; } -static int ata_set_probe(struct param_d *param, void *priv) +int ata_port_detect(struct ata_port *port) { - struct ata_port *port = priv; int ret; - if (!port->probe) - return 0; - if (port->initialized) { dev_info(&port->class_dev, "already initialized\n"); return 0; @@ -303,6 +299,23 @@ static int ata_set_probe(struct param_d *param, void *priv) return 0; } +static int ata_set_probe(struct param_d *param, void *priv) +{ + struct ata_port *port = priv; + + if (!port->probe) + return 0; + + return ata_port_detect(port); +} + +static int ata_detect(struct device_d *dev) +{ + struct ata_port *port = container_of(dev, struct ata_port, class_dev); + + return ata_port_detect(port); +} + /** * Register an ATA drive behind an IDE like interface * @param dev The interface device @@ -316,6 +329,7 @@ int ata_port_register(struct ata_port *port) port->class_dev.id = DEVICE_ID_DYNAMIC; strcpy(port->class_dev.name, "ata"); port->class_dev.parent = port->dev; + port->class_dev.detect = ata_detect; ret = register_device(&port->class_dev); if (ret) -- cgit v1.2.3