Commit d961450d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

firewire: remove driver_data direct access of struct device

In the near future, the driver core is going to not allow direct access
to the driver_data pointer in struct device.  Instead, the functions
dev_get_drvdata() and dev_set_drvdata() should be used.  These functions
have been around since the beginning, so are backwards compatible with
all older kernel versions.

Cc: linux1394-devel@lists.sourceforge.net
Acked-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
Cc: Kristian Hoegsberg <krh@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4b9d0d3b
...@@ -1125,7 +1125,7 @@ static int sbp2_probe(struct device *dev) ...@@ -1125,7 +1125,7 @@ static int sbp2_probe(struct device *dev)
return -ENOMEM; return -ENOMEM;
tgt = (struct sbp2_target *)shost->hostdata; tgt = (struct sbp2_target *)shost->hostdata;
unit->device.driver_data = tgt; dev_set_drvdata(&unit->device, tgt);
tgt->unit = unit; tgt->unit = unit;
kref_init(&tgt->kref); kref_init(&tgt->kref);
INIT_LIST_HEAD(&tgt->lu_list); INIT_LIST_HEAD(&tgt->lu_list);
...@@ -1180,7 +1180,7 @@ static int sbp2_probe(struct device *dev) ...@@ -1180,7 +1180,7 @@ static int sbp2_probe(struct device *dev)
static int sbp2_remove(struct device *dev) static int sbp2_remove(struct device *dev)
{ {
struct fw_unit *unit = fw_unit(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); sbp2_target_put(tgt);
return 0; return 0;
...@@ -1240,7 +1240,7 @@ static void sbp2_reconnect(struct work_struct *work) ...@@ -1240,7 +1240,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; struct sbp2_logical_unit *lu;
fw_device_enable_phys_dma(fw_device(unit->device.parent)); fw_device_enable_phys_dma(fw_device(unit->device.parent));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment