diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-06-11 21:06:26 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-06-19 18:48:36 +0200 |
| commit | 2093884040d799898c9931d5c4032b64a145c6c2 (patch) | |
| tree | 15d111e0edd8a7eba162589718790d9fb44d7267 /drivers/ata | |
| parent | 48939b0b70292527b9260c7bf6e68fe5272dce96 (diff) | |
| download | barebox-2093884040d799898c9931d5c4032b64a145c6c2.tar.gz barebox-2093884040d799898c9931d5c4032b64a145c6c2.tar.xz | |
ata: ide: Allow to set the devicename
To get persistent devicenames under /dev/ allow to set the
devicename from the driver instead of using "ata" unconditionally.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/disk_ata_drive.c | 22 | ||||
| -rw-r--r-- | drivers/ata/ide-sff.c | 3 | ||||
| -rw-r--r-- | drivers/ata/intf_platform_ide.c | 2 | ||||
| -rw-r--r-- | drivers/ata/pata-imx.c | 2 |
4 files changed, 20 insertions, 9 deletions
diff --git a/drivers/ata/disk_ata_drive.c b/drivers/ata/disk_ata_drive.c index 7669539485..e96d98dd2c 100644 --- a/drivers/ata/disk_ata_drive.c +++ b/drivers/ata/disk_ata_drive.c @@ -254,12 +254,16 @@ static int ata_port_init(struct ata_port *port) #ifdef DEBUG ata_dump_id(port->id); #endif - rc = cdev_find_free_index("ata"); - if (rc == -1) - pr_err("Cannot find a free index for the disk node\n"); + if (port->devname) { + port->blk.cdev.name = xstrdup(port->devname); + } else { + rc = cdev_find_free_index("ata"); + if (rc == -1) + pr_err("Cannot find a free index for the disk node\n"); + port->blk.cdev.name = asprintf("ata%d", rc); + } port->blk.num_blocks = ata_id_n_sectors(port->id); - port->blk.cdev.name = asprintf("ata%d", rc); port->blk.blockbits = SECTOR_SHIFT; rc = blockdevice_register(&port->blk); @@ -326,8 +330,14 @@ int ata_port_register(struct ata_port *port) { int ret; - port->class_dev.id = DEVICE_ID_DYNAMIC; - strcpy(port->class_dev.name, "ata"); + if (port->devname) { + strcpy(port->class_dev.name, port->devname); + port->class_dev.id = DEVICE_ID_SINGLE; + } else { + strcpy(port->class_dev.name, "ata"); + port->class_dev.id = DEVICE_ID_DYNAMIC; + } + port->class_dev.parent = port->dev; port->class_dev.detect = ata_detect; diff --git a/drivers/ata/ide-sff.c b/drivers/ata/ide-sff.c index 632b0e5910..ef55357d5e 100644 --- a/drivers/ata/ide-sff.c +++ b/drivers/ata/ide-sff.c @@ -324,7 +324,7 @@ static struct ata_port_operations ide_ops = { .reset = ide_reset, }; -int ide_port_register(struct device_d *dev, struct ata_ioports *io) +int ide_port_register(struct device_d *dev, struct ata_ioports *io, const char *devname) { struct ide_port *ide; int ret; @@ -334,6 +334,7 @@ int ide_port_register(struct device_d *dev, struct ata_ioports *io) ide->io = io; ide->port.ops = &ide_ops; ide->port.dev = dev; + ide->port.devname = devname; ret = ata_port_register(&ide->port); diff --git a/drivers/ata/intf_platform_ide.c b/drivers/ata/intf_platform_ide.c index 0b56eb4aa8..455ac28b53 100644 --- a/drivers/ata/intf_platform_ide.c +++ b/drivers/ata/intf_platform_ide.c @@ -95,7 +95,7 @@ static int platform_ide_probe(struct device_d *dev) io->reset = pdata->reset; io->dataif_be = pdata->dataif_be; - rc = ide_port_register(dev, io); + rc = ide_port_register(dev, io, NULL); if (rc != 0) { dev_err(dev, "Cannot register IDE interface\n"); free(io); diff --git a/drivers/ata/pata-imx.c b/drivers/ata/pata-imx.c index 5d44883453..2e45c94aeb 100644 --- a/drivers/ata/pata-imx.c +++ b/drivers/ata/pata-imx.c @@ -172,7 +172,7 @@ static int imx_pata_probe(struct device_d *dev) pata_imx_set_bus_timing(base, clk_get_rate(clk), 4); - ret= ide_port_register(dev, io); + ret = ide_port_register(dev, io, NULL); if (ret) { dev_err(dev, "Cannot register IDE interface: %s\n", strerror(-ret)); |