diff options
Diffstat (limited to 'drivers/pcmcia/soc_common.c')
-rw-r--r-- | drivers/pcmcia/soc_common.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c index e433704e026a..d2a3bea55de2 100644 --- a/drivers/pcmcia/soc_common.c +++ b/drivers/pcmcia/soc_common.c | |||
@@ -478,10 +478,10 @@ dump_bits(char **p, const char *prefix, unsigned int val, struct bittbl *bits, i | |||
478 | * | 478 | * |
479 | * Returns: the number of characters added to the buffer | 479 | * Returns: the number of characters added to the buffer |
480 | */ | 480 | */ |
481 | static ssize_t show_status(struct class_device *class_dev, char *buf) | 481 | static ssize_t show_status(struct device *dev, char *buf) |
482 | { | 482 | { |
483 | struct soc_pcmcia_socket *skt = | 483 | struct soc_pcmcia_socket *skt = |
484 | container_of(class_dev, struct soc_pcmcia_socket, socket.dev); | 484 | container_of(dev, struct soc_pcmcia_socket, socket.dev); |
485 | char *p = buf; | 485 | char *p = buf; |
486 | 486 | ||
487 | p+=sprintf(p, "slot : %d\n", skt->nr); | 487 | p+=sprintf(p, "slot : %d\n", skt->nr); |
@@ -747,7 +747,7 @@ int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops | |||
747 | 747 | ||
748 | add_timer(&skt->poll_timer); | 748 | add_timer(&skt->poll_timer); |
749 | 749 | ||
750 | class_device_create_file(&skt->socket.dev, &class_device_attr_status); | 750 | device_create_file(&skt->socket.dev, &device_attr_status); |
751 | } | 751 | } |
752 | 752 | ||
753 | dev_set_drvdata(dev, sinfo); | 753 | dev_set_drvdata(dev, sinfo); |