Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=1e2831db01c0726ec046e69719a10d7696b283fb
Commit:     1e2831db01c0726ec046e69719a10d7696b283fb
Parent:     ae91d10aab2762f81733e9194cb56eff99c8d808
Author:     Dmitry Torokhov <[EMAIL PROTECTED]>
AuthorDate: Thu Jun 14 23:58:51 2007 -0400
Committer:  Dmitry Torokhov <[EMAIL PROTECTED]>
CommitDate: Tue Jul 10 00:35:18 2007 -0400

    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 <[EMAIL PROTECTED]>
---
 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 5f38f67..a1aa89f 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)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to