diff options
Diffstat (limited to 'arch/sparc/kernel/apc.c')
-rw-r--r-- | arch/sparc/kernel/apc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/sparc/kernel/apc.c b/arch/sparc/kernel/apc.c index 2c0046ecc715..caef9deb5866 100644 --- a/arch/sparc/kernel/apc.c +++ b/arch/sparc/kernel/apc.c | |||
@@ -123,7 +123,7 @@ static long apc_ioctl(struct file *f, unsigned int cmd, unsigned long __arg) | |||
123 | 123 | ||
124 | default: | 124 | default: |
125 | return -EINVAL; | 125 | return -EINVAL; |
126 | }; | 126 | } |
127 | 127 | ||
128 | return 0; | 128 | return 0; |
129 | } | 129 | } |
@@ -132,12 +132,12 @@ static const struct file_operations apc_fops = { | |||
132 | .unlocked_ioctl = apc_ioctl, | 132 | .unlocked_ioctl = apc_ioctl, |
133 | .open = apc_open, | 133 | .open = apc_open, |
134 | .release = apc_release, | 134 | .release = apc_release, |
135 | .llseek = noop_llseek, | ||
135 | }; | 136 | }; |
136 | 137 | ||
137 | static struct miscdevice apc_miscdev = { APC_MINOR, APC_DEVNAME, &apc_fops }; | 138 | static struct miscdevice apc_miscdev = { APC_MINOR, APC_DEVNAME, &apc_fops }; |
138 | 139 | ||
139 | static int __devinit apc_probe(struct platform_device *op, | 140 | static int __devinit apc_probe(struct platform_device *op) |
140 | const struct of_device_id *match) | ||
141 | { | 141 | { |
142 | int err; | 142 | int err; |
143 | 143 | ||
@@ -165,7 +165,7 @@ static int __devinit apc_probe(struct platform_device *op, | |||
165 | return 0; | 165 | return 0; |
166 | } | 166 | } |
167 | 167 | ||
168 | static struct of_device_id __initdata apc_match[] = { | 168 | static struct of_device_id apc_match[] = { |
169 | { | 169 | { |
170 | .name = APC_OBPNAME, | 170 | .name = APC_OBPNAME, |
171 | }, | 171 | }, |
@@ -173,7 +173,7 @@ static struct of_device_id __initdata apc_match[] = { | |||
173 | }; | 173 | }; |
174 | MODULE_DEVICE_TABLE(of, apc_match); | 174 | MODULE_DEVICE_TABLE(of, apc_match); |
175 | 175 | ||
176 | static struct of_platform_driver apc_driver = { | 176 | static struct platform_driver apc_driver = { |
177 | .driver = { | 177 | .driver = { |
178 | .name = "apc", | 178 | .name = "apc", |
179 | .owner = THIS_MODULE, | 179 | .owner = THIS_MODULE, |
@@ -184,7 +184,7 @@ static struct of_platform_driver apc_driver = { | |||
184 | 184 | ||
185 | static int __init apc_init(void) | 185 | static int __init apc_init(void) |
186 | { | 186 | { |
187 | return of_register_platform_driver(&apc_driver); | 187 | return platform_driver_register(&apc_driver); |
188 | } | 188 | } |
189 | 189 | ||
190 | /* This driver is not critical to the boot process | 190 | /* This driver is not critical to the boot process |