Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Input: ambakmi - annotate probe() and remove() methods

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

+4 -4
+4 -4
drivers/input/serio/ambakmi.c
··· 107 107 clk_disable(kmi->clk); 108 108 } 109 109 110 - static int amba_kmi_probe(struct amba_device *dev, struct amba_id *id) 110 + static int __devinit amba_kmi_probe(struct amba_device *dev, struct amba_id *id) 111 111 { 112 112 struct amba_kmi_port *kmi; 113 113 struct serio *io; ··· 134 134 io->port_data = kmi; 135 135 io->dev.parent = &dev->dev; 136 136 137 - kmi->io = io; 137 + kmi->io = io; 138 138 kmi->base = ioremap(dev->res.start, resource_size(&dev->res)); 139 139 if (!kmi->base) { 140 140 ret = -ENOMEM; ··· 162 162 return ret; 163 163 } 164 164 165 - static int amba_kmi_remove(struct amba_device *dev) 165 + static int __devexit amba_kmi_remove(struct amba_device *dev) 166 166 { 167 167 struct amba_kmi_port *kmi = amba_get_drvdata(dev); 168 168 ··· 201 201 }, 202 202 .id_table = amba_kmi_idtable, 203 203 .probe = amba_kmi_probe, 204 - .remove = amba_kmi_remove, 204 + .remove = __devexit_p(amba_kmi_remove), 205 205 .resume = amba_kmi_resume, 206 206 }; 207 207