[SCSI] zfcp: Access ports and units with container_of in sysfs code

When accessing port and unit attributes, use container_of instead of
dev_get_drvdata. This eliminates some code checker warnings about
aliased access of data structures.

Reviewed-by: Swen Schillig <swen@vnet.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
Christof Schmitt 2009-11-24 16:54:02 +01:00 committed by James Bottomley
parent b42aeceb35
commit 25458eb791
2 changed files with 10 additions and 7 deletions

View File

@ -319,7 +319,6 @@ struct zfcp_unit *zfcp_unit_enqueue(struct zfcp_port *port, u64 fcp_lun)
kfree(unit); kfree(unit);
goto err_out; goto err_out;
} }
dev_set_drvdata(&unit->sysfs_device, unit);
retval = -EINVAL; retval = -EINVAL;
/* mark unit unusable as long as sysfs registration is not complete */ /* mark unit unusable as long as sysfs registration is not complete */
@ -688,7 +687,6 @@ struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, u64 wwpn,
kfree(port); kfree(port);
goto err_out; goto err_out;
} }
dev_set_drvdata(&port->sysfs_device, port);
retval = -EINVAL; retval = -EINVAL;
if (device_register(&port->sysfs_device)) { if (device_register(&port->sysfs_device)) {

View File

@ -19,7 +19,8 @@ static ssize_t zfcp_sysfs_##_feat##_##_name##_show(struct device *dev, \
struct device_attribute *at,\ struct device_attribute *at,\
char *buf) \ char *buf) \
{ \ { \
struct _feat_def *_feat = dev_get_drvdata(dev); \ struct _feat_def *_feat = container_of(dev, struct _feat_def, \
sysfs_device); \
\ \
return sprintf(buf, _format, _value); \ return sprintf(buf, _format, _value); \
} \ } \
@ -86,7 +87,8 @@ static ssize_t zfcp_sysfs_##_feat##_failed_show(struct device *dev, \
struct device_attribute *attr, \ struct device_attribute *attr, \
char *buf) \ char *buf) \
{ \ { \
struct _feat_def *_feat = dev_get_drvdata(dev); \ struct _feat_def *_feat = container_of(dev, struct _feat_def, \
sysfs_device); \
\ \
if (atomic_read(&_feat->status) & ZFCP_STATUS_COMMON_ERP_FAILED) \ if (atomic_read(&_feat->status) & ZFCP_STATUS_COMMON_ERP_FAILED) \
return sprintf(buf, "1\n"); \ return sprintf(buf, "1\n"); \
@ -97,7 +99,8 @@ static ssize_t zfcp_sysfs_##_feat##_failed_store(struct device *dev, \
struct device_attribute *attr,\ struct device_attribute *attr,\
const char *buf, size_t count)\ const char *buf, size_t count)\
{ \ { \
struct _feat_def *_feat = dev_get_drvdata(dev); \ struct _feat_def *_feat = container_of(dev, struct _feat_def, \
sysfs_device); \
unsigned long val; \ unsigned long val; \
int retval = 0; \ int retval = 0; \
\ \
@ -274,7 +277,8 @@ static ssize_t zfcp_sysfs_unit_add_store(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct zfcp_port *port = dev_get_drvdata(dev); struct zfcp_port *port = container_of(dev, struct zfcp_port,
sysfs_device);
struct zfcp_unit *unit; struct zfcp_unit *unit;
u64 fcp_lun; u64 fcp_lun;
int retval = -EINVAL; int retval = -EINVAL;
@ -305,7 +309,8 @@ static ssize_t zfcp_sysfs_unit_remove_store(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct zfcp_port *port = dev_get_drvdata(dev); struct zfcp_port *port = container_of(dev, struct zfcp_port,
sysfs_device);
struct zfcp_unit *unit; struct zfcp_unit *unit;
u64 fcp_lun; u64 fcp_lun;
int retval = 0; int retval = 0;