Tejun Heo wrote:
Implement ata_dev_init() which is called before probing for new
device. Note that ata_dev_init() is called only once for each
attached device while ata_dev_configure() can be called multiple times
for the same device.
This change will be used by following per-dev xfer_mask patch.
Signed-off-by: Tejun Heo <htejun@xxxxxxxxx>
---
fix-class-handling-in-ata_bus_probe[1] patch clashes with this one.
So, this is the regenerated patch. All others apply fine with offets.
[1] http://article.gmane.org/gmane.linux.ide/8712
libata-core.c | 28 ++++++++++++++++++++++------
1 file changed, 22 insertions(+), 6 deletions(-)
Index: work/drivers/scsi/libata-core.c
===================================================================
--- work.orig/drivers/scsi/libata-core.c 2006-03-13 14:52:17.000000000 +0900
+++ work/drivers/scsi/libata-core.c 2006-03-13 14:52:57.000000000 +0900
@@ -1045,6 +1045,25 @@ unsigned int ata_pio_need_iordy(const st
}
/**
+ * ata_dev_init - initialize ata_device structure
+ * @ap: Port on which target device resides
+ * @dev: Target device to initialize
+ *
+ * Initialize @dev in preparation for device probing. This
+ * function is called only when a new device is about to be
+ * probed. ie. ata_dev_configure() is responsible for cleaning
+ * up affected fields across revalidations.
+ *
+ * LOCKING:
+ * none.
+ */
+static void ata_dev_init(struct ata_port *ap, struct ata_device *dev)
+{
+ memset(dev, 0, sizeof(*dev));
+ dev->devno = dev - ap->device;
+}
+
+/**
* ata_dev_read_id - Read ID data from the specified device
* @ap: port on which target device resides
* @dev: target device
@@ -1371,8 +1390,10 @@ static int ata_bus_probe(struct ata_port
ata_port_probe(ap);
/* reset and determine device classes */
- for (i = 0; i < ATA_MAX_DEVICES; i++)
+ for (i = 0; i < ATA_MAX_DEVICES; i++) {
+ ata_dev_init(ap, &ap->device[i]);
classes[i] = ATA_DEV_UNKNOWN;
+ }
if (ap->ops->probe_reset) {
rc = ap->ops->probe_reset(ap, classes);
@@ -4607,8 +4628,6 @@ static void ata_host_init(struct ata_por
struct ata_host_set *host_set,
const struct ata_probe_ent *ent, unsigned int port_no)
{
- unsigned int i;
-
host->max_id = 16;
host->max_lun = 1;
host->max_channel = 1;
@@ -4635,9 +4654,6 @@ static void ata_host_init(struct ata_por
INIT_WORK(&ap->port_task, NULL, NULL);
INIT_LIST_HEAD(&ap->eh_done_q);
- for (i = 0; i < ATA_MAX_DEVICES; i++)
- ap->device[i].devno = i;
NAK:
1) the devices are embedded with ata_port, and so all static
initialization should be done in ata_host_init(). It's only called once
for each device, as you say, anyway... no need to separate it from the
rest of the struct ata_port initialization AFAICS.
2) there is no need to memset() [unless you are re-initializing, I suppose]
-
: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
