diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-03-03 18:13:36 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-04-19 22:10:29 -0400 |
commit | c4c66cf1787d408066fbfc69209185701f5df15f (patch) | |
tree | 989a6f49ae760b0015b489ca678bbe8baf2c3c85 /drivers/memstick/core/mspro_block.c | |
parent | 2b3a302a09735276e13421db56c20045a48eb06d (diff) |
memstick: convert struct class_device to struct device
struct class_device is going away, struct device should be used instead.
Signed-off-by: Tony Jones <tonyj@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Cc: Alex Dubov <oakad@yahoo.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/memstick/core/mspro_block.c')
-rw-r--r-- | drivers/memstick/core/mspro_block.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c index 557dbbba5cb2..477d0fb6e588 100644 --- a/drivers/memstick/core/mspro_block.c +++ b/drivers/memstick/core/mspro_block.c | |||
@@ -1127,8 +1127,8 @@ static int mspro_block_init_disk(struct memstick_dev *card) | |||
1127 | u64 limit = BLK_BOUNCE_HIGH; | 1127 | u64 limit = BLK_BOUNCE_HIGH; |
1128 | unsigned long capacity; | 1128 | unsigned long capacity; |
1129 | 1129 | ||
1130 | if (host->cdev.dev->dma_mask && *(host->cdev.dev->dma_mask)) | 1130 | if (host->dev.dma_mask && *(host->dev.dma_mask)) |
1131 | limit = *(host->cdev.dev->dma_mask); | 1131 | limit = *(host->dev.dma_mask); |
1132 | 1132 | ||
1133 | for (rc = 0; msb->attr_group.attrs[rc]; ++rc) { | 1133 | for (rc = 0; msb->attr_group.attrs[rc]; ++rc) { |
1134 | s_attr = mspro_from_sysfs_attr(msb->attr_group.attrs[rc]); | 1134 | s_attr = mspro_from_sysfs_attr(msb->attr_group.attrs[rc]); |