Skip to content

Commit

Permalink
Input: ppc-beep - switch to using input_dev->dev.parent
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dmitry Torokhov committed Jul 10, 2007
1 parent ae91d10 commit 1e2831d
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions sound/ppc/beep.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand All @@ -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)
Expand Down

0 comments on commit 1e2831d

Please sign in to comment.