diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-22 22:01:33 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-28 03:36:39 -0500 |
| commit | 4ebb24f707187196937607c60810d42f7112d7aa (patch) | |
| tree | 89a92b3f8dd55f3c5e0cfa73fa6446b3d490f3a8 /drivers/input/serio | |
| parent | 000061245a6797d542854106463b6b20fbdcb12e (diff) | |
dt/sparc: Eliminate users of of_platform_{,un}register_driver
Get rid of old users of of_platform_driver in arch/sparc. Most
of_platform_driver users can be converted to use the platform_bus
directly.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/i8042-sparcio.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/serio/i8042-sparcio.h b/drivers/input/serio/i8042-sparcio.h index c5cc4508d6d..395a9af3adc 100644 --- a/drivers/input/serio/i8042-sparcio.h +++ b/drivers/input/serio/i8042-sparcio.h | |||
| @@ -49,7 +49,7 @@ static inline void i8042_write_command(int val) | |||
| 49 | #define OBP_PS2MS_NAME1 "kdmouse" | 49 | #define OBP_PS2MS_NAME1 "kdmouse" |
| 50 | #define OBP_PS2MS_NAME2 "mouse" | 50 | #define OBP_PS2MS_NAME2 "mouse" |
| 51 | 51 | ||
| 52 | static int __devinit sparc_i8042_probe(struct platform_device *op, const struct of_device_id *match) | 52 | static int __devinit sparc_i8042_probe(struct platform_device *op) |
| 53 | { | 53 | { |
| 54 | struct device_node *dp = op->dev.of_node; | 54 | struct device_node *dp = op->dev.of_node; |
| 55 | 55 | ||
| @@ -95,7 +95,7 @@ static const struct of_device_id sparc_i8042_match[] = { | |||
| 95 | }; | 95 | }; |
| 96 | MODULE_DEVICE_TABLE(of, sparc_i8042_match); | 96 | MODULE_DEVICE_TABLE(of, sparc_i8042_match); |
| 97 | 97 | ||
| 98 | static struct of_platform_driver sparc_i8042_driver = { | 98 | static struct platform_driver sparc_i8042_driver = { |
| 99 | .driver = { | 99 | .driver = { |
| 100 | .name = "i8042", | 100 | .name = "i8042", |
| 101 | .owner = THIS_MODULE, | 101 | .owner = THIS_MODULE, |
| @@ -116,7 +116,7 @@ static int __init i8042_platform_init(void) | |||
| 116 | if (!kbd_iobase) | 116 | if (!kbd_iobase) |
| 117 | return -ENODEV; | 117 | return -ENODEV; |
| 118 | } else { | 118 | } else { |
| 119 | int err = of_register_platform_driver(&sparc_i8042_driver); | 119 | int err = platform_driver_register(&sparc_i8042_driver); |
| 120 | if (err) | 120 | if (err) |
| 121 | return err; | 121 | return err; |
| 122 | 122 | ||
| @@ -140,7 +140,7 @@ static inline void i8042_platform_exit(void) | |||
| 140 | struct device_node *root = of_find_node_by_path("/"); | 140 | struct device_node *root = of_find_node_by_path("/"); |
| 141 | 141 | ||
| 142 | if (strcmp(root->name, "SUNW,JavaStation-1")) | 142 | if (strcmp(root->name, "SUNW,JavaStation-1")) |
| 143 | of_unregister_platform_driver(&sparc_i8042_driver); | 143 | platform_driver_unregister(&sparc_i8042_driver); |
| 144 | } | 144 | } |
| 145 | 145 | ||
| 146 | #else /* !CONFIG_PCI */ | 146 | #else /* !CONFIG_PCI */ |
