diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-06-14 23:58:51 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-07-10 00:35:18 -0400 |
| commit | 1e2831db01c0726ec046e69719a10d7696b283fb (patch) | |
| tree | 85dc5cf6a6233b54d5786c1030204eef71dd23b7 /sound/ppc | |
| parent | ae91d10aab2762f81733e9194cb56eff99c8d808 (diff) | |
| download | linux-3.10-1e2831db01c0726ec046e69719a10d7696b283fb.tar.gz linux-3.10-1e2831db01c0726ec046e69719a10d7696b283fb.tar.bz2 linux-3.10-1e2831db01c0726ec046e69719a10d7696b283fb.zip | |
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/ppc')
| -rw-r--r-- | sound/ppc/beep.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/ppc/beep.c b/sound/ppc/beep.c index 5f38f670102..a1aa89f2faf 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, default: return -1; } - chip = dev->private; + chip = input_get_drvdata(dev); if (! chip || (beep = chip->beep) == NULL) return -1; @@ -239,8 +239,8 @@ int __init snd_pmac_attach_beep(struct snd_pmac *chip) input_dev->evbit[0] = BIT(EV_SND); input_dev->sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE); input_dev->event = snd_pmac_beep_event; - input_dev->private = chip; - input_dev->cdev.dev = &chip->pdev->dev; + input_dev->dev.parent = &chip->pdev->dev; + input_set_drvdata(input_dev, chip); beep->dev = input_dev; beep->buf = dmabuf; @@ -251,8 +251,8 @@ int __init snd_pmac_attach_beep(struct snd_pmac *chip) err = snd_ctl_add(chip->card, beep_ctl); if (err < 0) goto fail1; - - chip->beep = beep; + + chip->beep = beep; err = input_register_device(beep->dev); if (err) |