aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor@insightbb.com>2007-06-14 23:58:51 -0400
committerDmitry Torokhov <dtor@insightbb.com>2007-07-10 00:35:18 -0400
commit1e2831db01c0726ec046e69719a10d7696b283fb (patch)
tree85dc5cf6a6233b54d5786c1030204eef71dd23b7 /sound
parentae91d10aab2762f81733e9194cb56eff99c8d808 (diff)
Input: ppc-beep - switch to using input_dev->dev.parent
In preparation for struct class_device -> struct device input core conversion, switch to using input_dev->dev.parent when specifying device position in sysfs tree. Also, do not access input_dev->private directly, use helpers. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'sound')
-rw-r--r--sound/ppc/beep.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/ppc/beep.c b/sound/ppc/beep.c
index 5f38f670102c..a1aa89f2faf3 100644
--- a/sound/ppc/beep.c
+++ b/sound/ppc/beep.c
@@ -118,7 +118,7 @@ static int snd_pmac_beep_event(struct input_dev *dev, unsigned int type,
118 default: return -1; 118 default: return -1;
119 } 119 }
120 120
121 chip = dev->private; 121 chip = input_get_drvdata(dev);
122 if (! chip || (beep = chip->beep) == NULL) 122 if (! chip || (beep = chip->beep) == NULL)
123 return -1; 123 return -1;
124 124
@@ -239,8 +239,8 @@ int __init snd_pmac_attach_beep(struct snd_pmac *chip)
239 input_dev->evbit[0] = BIT(EV_SND); 239 input_dev->evbit[0] = BIT(EV_SND);
240 input_dev->sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE); 240 input_dev->sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE);
241 input_dev->event = snd_pmac_beep_event; 241 input_dev->event = snd_pmac_beep_event;
242 input_dev->private = chip; 242 input_dev->dev.parent = &chip->pdev->dev;
243 input_dev->cdev.dev = &chip->pdev->dev; 243 input_set_drvdata(input_dev, chip);
244 244
245 beep->dev = input_dev; 245 beep->dev = input_dev;
246 beep->buf = dmabuf; 246 beep->buf = dmabuf;
@@ -251,8 +251,8 @@ int __init snd_pmac_attach_beep(struct snd_pmac *chip)
251 err = snd_ctl_add(chip->card, beep_ctl); 251 err = snd_ctl_add(chip->card, beep_ctl);
252 if (err < 0) 252 if (err < 0)
253 goto fail1; 253 goto fail1;
254 254
255 chip->beep = beep; 255 chip->beep = beep;
256 256
257 err = input_register_device(beep->dev); 257 err = input_register_device(beep->dev);
258 if (err) 258 if (err)