This patch adds a new dummy bus 'ata', which collects all ata device
objects like ata_port, ata_link, and ata_dev, and adds an 'ata' prefix
to the message log.
For consistency the 'ata_port' name has been changed from 'ata' to 'port';
to cover for sysfs incompabilities I've added a link from the original
'ata' device to the new 'port' device.
Signed-off-by: Hannes Reinecke <hare@xxxxxxx>
---
drivers/ata/libata-transport.c | 38 ++++++++++++++++++++++--
include/linux/libata.h | 54 ++++++++++------------------------
2 files changed, 51 insertions(+), 41 deletions(-)
diff --git a/drivers/ata/libata-transport.c b/drivers/ata/libata-transport.c
index ca129854a88c..5169a5db141d 100644
--- a/drivers/ata/libata-transport.c
+++ b/drivers/ata/libata-transport.c
@@ -81,10 +81,14 @@ struct ata_internal {
tdev_to_port((dev)->parent)
-/* Device objects are always created whit link objects */
+/* Device objects are always created with link objects */
static int ata_tdev_add(struct ata_device *dev);
static void ata_tdev_delete(struct ata_device *dev);
+struct bus_type ata_bus_type = {
+ .name = "ata",
+};
+
/*
* Hack to allow attributes of the same name in different objects.
@@ -257,12 +261,15 @@ static int ata_tport_match(struct attribute_container *cont,
void ata_tport_delete(struct ata_port *ap)
{
struct device *dev = &ap->tdev;
+ struct device *cdev = &ap->cdev;
ata_tlink_delete(&ap->link);
+ device_del(cdev);
transport_remove_device(dev);
device_del(dev);
transport_destroy_device(dev);
+ put_device(cdev);
put_device(dev);
}
@@ -281,6 +288,7 @@ int ata_tport_add(struct device *parent,
{
int error;
struct device *dev = &ap->tdev;
+ struct device *cdev = &ap->cdev;
device_initialize(dev);
dev->type = &ata_port_type;
@@ -288,7 +296,14 @@ int ata_tport_add(struct device *parent,
dev->parent = parent;
ata_host_get(ap->host);
dev->release = ata_tport_release;
- dev_set_name(dev, "ata%d", ap->print_id);
+ dev->bus = &ata_bus_type;
+ dev_set_name(dev, "port%d", ap->print_id);
+
+ device_initialize(cdev);
+ cdev->parent = get_device(dev);
+ cdev->class = &ata_port_class.class;
+ dev_set_name(cdev, "ata%d", ap->print_id);
+
transport_setup_device(dev);
ata_acpi_bind_port(ap);
error = device_add(dev);
@@ -296,6 +311,11 @@ int ata_tport_add(struct device *parent,
goto tport_err;
}
+ error = device_add(cdev);
+ if (error) {
+ goto cdev_err;
+ }
+
device_enable_async_suspend(dev);
pm_runtime_set_active(dev);
pm_runtime_enable(dev);
@@ -311,11 +331,14 @@ int ata_tport_add(struct device *parent,
return 0;
tport_link_err:
+ device_del(cdev);
+ cdev_err:
transport_remove_device(dev);
device_del(dev);
tport_err:
transport_destroy_device(dev);
+ put_device(cdev);
put_device(dev);
ata_host_put(ap->host);
return error;
@@ -444,6 +467,8 @@ int ata_tlink_add(struct ata_link *link)
device_initialize(dev);
dev->parent = &ap->tdev;
dev->release = ata_tlink_release;
+ dev->bus = &ata_bus_type;
+
if (ata_is_host_link(link))
dev_set_name(dev, "link%d", ap->print_id);
else
@@ -695,8 +720,10 @@ static int ata_tdev_add(struct ata_device *ata_dev)
device_initialize(dev);
dev->parent = &link->tdev;
dev->release = ata_tdev_release;
+ dev->bus = &ata_bus_type;
+
if (ata_is_host_link(link))
- dev_set_name(dev, "dev%d.%d", ap->print_id,ata_dev->devno);
+ dev_set_name(dev, "dev%d.%d", ap->print_id, ata_dev->devno);
else
dev_set_name(dev, "dev%d.%d.0", ap->print_id, link->pmp);
@@ -822,8 +849,13 @@ __init int libata_transport_init(void)
error = transport_class_register(&ata_dev_class);
if (error)
goto out_unregister_port;
+ error = bus_register(&ata_bus_type);
+ if (error)
+ goto out_unregister_bus;
return 0;
+ out_unregister_bus:
+ bus_unregister(&ata_bus_type);
out_unregister_port:
transport_class_unregister(&ata_port_class);
out_unregister_link:
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 605756f645be..3460d7684464 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -829,6 +829,7 @@ struct ata_port {
struct ata_host *host;
struct device *dev;
struct device tdev;
+ struct device cdev;
struct mutex scsi_scan_mutex;
struct delayed_work hotplug_task;
@@ -1452,61 +1453,38 @@ static inline int sata_srst_pmp(struct ata_link *link)
return link->pmp;
}
-#define ata_port_printk(level, ap, fmt, ...) \
- pr_ ## level ("ata%u: " fmt, (ap)->print_id, ##__VA_ARGS__)
-
#define ata_port_err(ap, fmt, ...) \
- ata_port_printk(err, ap, fmt, ##__VA_ARGS__)
+ dev_err(&ap->tdev, fmt, ##__VA_ARGS__)
#define ata_port_warn(ap, fmt, ...) \
- ata_port_printk(warn, ap, fmt, ##__VA_ARGS__)
+ dev_warn(&ap->tdev, fmt, ##__VA_ARGS__)
#define ata_port_notice(ap, fmt, ...) \
- ata_port_printk(notice, ap, fmt, ##__VA_ARGS__)
+ dev_notice(&ap->tdev, fmt, ##__VA_ARGS__)
#define ata_port_info(ap, fmt, ...) \
- ata_port_printk(info, ap, fmt, ##__VA_ARGS__)
+ dev_info(&ap->tdev, fmt, ##__VA_ARGS__)
#define ata_port_dbg(ap, fmt, ...) \
- ata_port_printk(debug, ap, fmt, ##__VA_ARGS__)
-
-#define ata_link_printk(level, link, fmt, ...) \
-do { \
- if (sata_pmp_attached((link)->ap) || \
- (link)->ap->slave_link) \
- pr_ ## level ("ata%u.%02u: " fmt, \
- (link)->ap->print_id, \
- (link)->pmp, \
- ##__VA_ARGS__); \
- else \
- pr_ ## level ("ata%u: " fmt, \
- (link)->ap->print_id, \
- ##__VA_ARGS__); \
-} while (0)
+ dev_dbg(&ap->tdev, fmt, ##__VA_ARGS__)
#define ata_link_err(link, fmt, ...) \
- ata_link_printk(err, link, fmt, ##__VA_ARGS__)
+ dev_err(&link->tdev, fmt, ##__VA_ARGS__)
#define ata_link_warn(link, fmt, ...) \
- ata_link_printk(warn, link, fmt, ##__VA_ARGS__)
+ dev_warn(&link->tdev, fmt, ##__VA_ARGS__)
#define ata_link_notice(link, fmt, ...) \
- ata_link_printk(notice, link, fmt, ##__VA_ARGS__)
+ dev_notice(&link->tdev, fmt, ##__VA_ARGS__)
#define ata_link_info(link, fmt, ...) \
- ata_link_printk(info, link, fmt, ##__VA_ARGS__)
+ dev_info(&link->tdev, fmt, ##__VA_ARGS__)
#define ata_link_dbg(link, fmt, ...) \
- ata_link_printk(debug, link, fmt, ##__VA_ARGS__)
-
-#define ata_dev_printk(level, dev, fmt, ...) \
- pr_ ## level("ata%u.%02u: " fmt, \
- (dev)->link->ap->print_id, \
- (dev)->link->pmp + (dev)->devno, \
- ##__VA_ARGS__)
+ dev_dbg(&link->tdev, fmt, ##__VA_ARGS__)
#define ata_dev_err(dev, fmt, ...) \
- ata_dev_printk(err, dev, fmt, ##__VA_ARGS__)
+ dev_err(&dev->tdev, fmt, ##__VA_ARGS__)
#define ata_dev_warn(dev, fmt, ...) \
- ata_dev_printk(warn, dev, fmt, ##__VA_ARGS__)
+ dev_warn(&dev->tdev, fmt, ##__VA_ARGS__)
#define ata_dev_notice(dev, fmt, ...) \
- ata_dev_printk(notice, dev, fmt, ##__VA_ARGS__)
+ dev_notice(&dev->tdev, fmt, ##__VA_ARGS__)
#define ata_dev_info(dev, fmt, ...) \
- ata_dev_printk(info, dev, fmt, ##__VA_ARGS__)
+ dev_info(&dev->tdev, fmt, ##__VA_ARGS__)
#define ata_dev_dbg(dev, fmt, ...) \
- ata_dev_printk(debug, dev, fmt, ##__VA_ARGS__)
+ dev_dbg(&dev->tdev, fmt, ##__VA_ARGS__)
void ata_print_version(const struct device *dev, const char *version);
--
2.29.2
