diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-01-28 10:59:09 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-01-28 10:59:09 +0000 |
| commit | cd4c1eb51064f24a8b0a53069c4d004deade65c7 (patch) | |
| tree | d18fd81d86345e710b03a51aa800d2dc119cb7ba | |
| parent | 193c3cc12583344be01206078d9ad3fec5dbc397 (diff) | |
| download | kernel-crypto-cd4c1eb51064f24a8b0a53069c4d004deade65c7.tar.gz kernel-crypto-cd4c1eb51064f24a8b0a53069c4d004deade65c7.tar.xz kernel-crypto-cd4c1eb51064f24a8b0a53069c4d004deade65c7.zip | |
[ARM] Fix class_device damage caused by 0c55445f201841bfd6c658c47df8311b6722f002
Lots of compile errors in drivers/mfd/ucb1x00-assabet.c...
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | drivers/mfd/ucb1x00-assabet.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/mfd/ucb1x00-assabet.c b/drivers/mfd/ucb1x00-assabet.c index b7c8e781386..61aeaf79640 100644 --- a/drivers/mfd/ucb1x00-assabet.c +++ b/drivers/mfd/ucb1x00-assabet.c @@ -20,7 +20,7 @@ #include "ucb1x00.h" #define UCB1X00_ATTR(name,input)\ -static ssize_t name##_show(struct device *dev, struct device_attribute *attr, +static ssize_t name##_show(struct device *dev, struct device_attribute *attr, \ char *buf) \ { \ struct ucb1x00 *ucb = classdev_to_ucb1x00(dev); \ @@ -38,17 +38,17 @@ UCB1X00_ATTR(batt_temp, UCB_ADC_INP_AD2); static int ucb1x00_assabet_add(struct ucb1x00_dev *dev) { - device_create_file(&dev->ucb->dev, &device_attr_vbatt); - device_create_file(&dev->ucb->dev, &device_attr_vcharger); - device_create_file(&dev->ucb->dev, &device_attr_batt_temp); + device_create_file(&dev->ucb->dev, &dev_attr_vbatt); + device_create_file(&dev->ucb->dev, &dev_attr_vcharger); + device_create_file(&dev->ucb->dev, &dev_attr_batt_temp); return 0; } static void ucb1x00_assabet_remove(struct ucb1x00_dev *dev) { - device_remove_file(&dev->ucb->cdev, &device_attr_batt_temp); - device_remove_file(&dev->ucb->cdev, &device_attr_vcharger); - device_remove_file(&dev->ucb->cdev, &device_attr_vbatt); + device_remove_file(&dev->ucb->dev, &dev_attr_batt_temp); + device_remove_file(&dev->ucb->dev, &dev_attr_vcharger); + device_remove_file(&dev->ucb->dev, &dev_attr_vbatt); } static struct ucb1x00_driver ucb1x00_assabet_driver = { |