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

spi: butterfly: use new parport device model

Modify spi-butterfly driver to use the new parallel port device model.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Sudip Mukherjee and committed by
Mark Brown
1d3029cc e71fec73

+6 -4
+6 -4
drivers/spi/spi-butterfly.c
··· 189 189 struct butterfly *pp; 190 190 struct spi_master *master; 191 191 struct device *dev = p->physport->dev; 192 + struct pardev_cb butterfly_cb; 192 193 193 194 if (butterfly || !dev) 194 195 return; ··· 222 221 * parport hookup 223 222 */ 224 223 pp->port = p; 225 - pd = parport_register_device(p, "spi_butterfly", 226 - NULL, NULL, NULL, 227 - 0 /* FLAGS */, pp); 224 + memset(&butterfly_cb, 0, sizeof(butterfly_cb)); 225 + butterfly_cb.private = pp; 226 + pd = parport_register_dev_model(p, "spi_butterfly", &butterfly_cb, 0); 228 227 if (!pd) { 229 228 status = -ENOMEM; 230 229 goto clean0; ··· 322 321 323 322 static struct parport_driver butterfly_driver = { 324 323 .name = "spi_butterfly", 325 - .attach = butterfly_attach, 324 + .match_port = butterfly_attach, 326 325 .detach = butterfly_detach, 326 + .devmodel = true, 327 327 }; 328 328 329 329 static int __init butterfly_init(void)