mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 17:08:10 +00:00
Input: misc devices - 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. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
parent
935e658e89
commit
293e6392d7
4 changed files with 6 additions and 6 deletions
|
@ -107,7 +107,7 @@ static int __devinit ixp4xx_spkr_probe(struct platform_device *dev)
|
||||||
input_dev->id.vendor = 0x001f;
|
input_dev->id.vendor = 0x001f;
|
||||||
input_dev->id.product = 0x0001;
|
input_dev->id.product = 0x0001;
|
||||||
input_dev->id.version = 0x0100;
|
input_dev->id.version = 0x0100;
|
||||||
input_dev->cdev.dev = &dev->dev;
|
input_dev->dev.parent = &dev->dev;
|
||||||
|
|
||||||
input_dev->evbit[0] = BIT(EV_SND);
|
input_dev->evbit[0] = BIT(EV_SND);
|
||||||
input_dev->sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE);
|
input_dev->sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE);
|
||||||
|
|
|
@ -63,7 +63,7 @@ static int __devinit m68kspkr_probe(struct platform_device *dev)
|
||||||
input_dev->id.vendor = 0x001f;
|
input_dev->id.vendor = 0x001f;
|
||||||
input_dev->id.product = 0x0001;
|
input_dev->id.product = 0x0001;
|
||||||
input_dev->id.version = 0x0100;
|
input_dev->id.version = 0x0100;
|
||||||
input_dev->cdev.dev = &dev->dev;
|
input_dev->dev.parent = &dev->dev;
|
||||||
|
|
||||||
input_dev->evbit[0] = BIT(EV_SND);
|
input_dev->evbit[0] = BIT(EV_SND);
|
||||||
input_dev->sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE);
|
input_dev->sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE);
|
||||||
|
|
|
@ -78,7 +78,7 @@ static int __devinit pcspkr_probe(struct platform_device *dev)
|
||||||
pcspkr_dev->id.vendor = 0x001f;
|
pcspkr_dev->id.vendor = 0x001f;
|
||||||
pcspkr_dev->id.product = 0x0001;
|
pcspkr_dev->id.product = 0x0001;
|
||||||
pcspkr_dev->id.version = 0x0100;
|
pcspkr_dev->id.version = 0x0100;
|
||||||
pcspkr_dev->cdev.dev = &dev->dev;
|
pcspkr_dev->dev.parent = &dev->dev;
|
||||||
|
|
||||||
pcspkr_dev->evbit[0] = BIT(EV_SND);
|
pcspkr_dev->evbit[0] = BIT(EV_SND);
|
||||||
pcspkr_dev->sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE);
|
pcspkr_dev->sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE);
|
||||||
|
|
|
@ -28,7 +28,7 @@ struct sparcspkr_state {
|
||||||
|
|
||||||
static int ebus_spkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
|
static int ebus_spkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
|
||||||
{
|
{
|
||||||
struct sparcspkr_state *state = dev_get_drvdata(dev->cdev.dev);
|
struct sparcspkr_state *state = dev_get_drvdata(dev->dev.parent);
|
||||||
unsigned int count = 0;
|
unsigned int count = 0;
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
|
||||||
|
@ -61,7 +61,7 @@ static int ebus_spkr_event(struct input_dev *dev, unsigned int type, unsigned in
|
||||||
|
|
||||||
static int isa_spkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
|
static int isa_spkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
|
||||||
{
|
{
|
||||||
struct sparcspkr_state *state = dev_get_drvdata(dev->cdev.dev);
|
struct sparcspkr_state *state = dev_get_drvdata(dev->dev.parent);
|
||||||
unsigned int count = 0;
|
unsigned int count = 0;
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
|
||||||
|
@ -113,7 +113,7 @@ static int __devinit sparcspkr_probe(struct device *dev)
|
||||||
input_dev->id.vendor = 0x001f;
|
input_dev->id.vendor = 0x001f;
|
||||||
input_dev->id.product = 0x0001;
|
input_dev->id.product = 0x0001;
|
||||||
input_dev->id.version = 0x0100;
|
input_dev->id.version = 0x0100;
|
||||||
input_dev->cdev.dev = dev;
|
input_dev->dev.parent = dev;
|
||||||
|
|
||||||
input_dev->evbit[0] = BIT(EV_SND);
|
input_dev->evbit[0] = BIT(EV_SND);
|
||||||
input_dev->sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE);
|
input_dev->sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE);
|
||||||
|
|
Loading…
Reference in a new issue