ppc-beep - switch to using input_dev->dev.parent

PATCH New Dmitry Torokhov 1 participant 1 message May 8, 2007 Sound

Share & tools

Dmitry Torokhov

author

2007-05-08 04:53 UTC #0 lore raw

PATCH 1/1 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(-)

sound/ppc/beep.c +5 -5

Index: work/sound/ppc/beep.c
===================================================================
@@ -118,7 +118,7 @@ static int snd_pmac_beep_event(struct in
 	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 s
 	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 s
 	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)