Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[pandora-kernel.git] / drivers / firewire / sbp2.c

diff --git a/drivers/firewire/sbp2.c b/drivers/firewire/sbp2.c
index 2353643..24c4563 100644 (file)
--- a/drivers/firewire/sbp2.c
+++ b/drivers/firewire/sbp2.c
@@ -1136,7 +1136,7 @@ static int sbp2_probe(struct device *dev)
                return -ENOMEM;
 
        tgt = (struct sbp2_target *)shost->hostdata;
                return -ENOMEM;
 
        tgt = (struct sbp2_target *)shost->hostdata;

-       unit->device.driver_data = tgt;
+       dev_set_drvdata(&unit->device, tgt);

        tgt->unit = unit;
        kref_init(&tgt->kref);
        INIT_LIST_HEAD(&tgt->lu_list);
        tgt->unit = unit;
        kref_init(&tgt->kref);
        INIT_LIST_HEAD(&tgt->lu_list);


@@ -1191,7 +1191,7 @@ static int sbp2_probe(struct device *dev)
 static int sbp2_remove(struct device *dev)
 {
        struct fw_unit *unit = fw_unit(dev);
 static int sbp2_remove(struct device *dev)
 {
        struct fw_unit *unit = fw_unit(dev);

-       struct sbp2_target *tgt = unit->device.driver_data;
+       struct sbp2_target *tgt = dev_get_drvdata(&unit->device);

 
        sbp2_target_put(tgt);
        return 0;
 
        sbp2_target_put(tgt);
        return 0;


@@ -1251,7 +1251,7 @@ static void sbp2_reconnect(struct work_struct *work)
 
 static void sbp2_update(struct fw_unit *unit)
 {
 
 static void sbp2_update(struct fw_unit *unit)
 {

-       struct sbp2_target *tgt = unit->device.driver_data;
+       struct sbp2_target *tgt = dev_get_drvdata(&unit->device);

        struct sbp2_logical_unit *lu;
 
        fw_device_enable_phys_dma(fw_parent_device(unit));
        struct sbp2_logical_unit *lu;
 
        fw_device_enable_phys_dma(fw_parent_device(unit));