| Message ID | 20240123221227.868341-3-afd@ti.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/3] udmabuf: Keep track current device mappings | expand |
Acked-by: Vivek Kasireddy <vivek.kasireddy@intel.com> > > Now that we do not need to call dma_coerce_mask_and_coherent() on our > miscdevice device, use the module_misc_device() helper for registering and > module init/exit. > > Signed-off-by: Andrew Davis <afd@ti.com> > --- > drivers/dma-buf/udmabuf.c | 30 +----------------------------- > 1 file changed, 1 insertion(+), 29 deletions(-) > > diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c index > ab6764322523c..3028ac3fd9f6a 100644 > --- a/drivers/dma-buf/udmabuf.c > +++ b/drivers/dma-buf/udmabuf.c > @@ -392,34 +392,6 @@ static struct miscdevice udmabuf_misc = { > .name = "udmabuf", > .fops = &udmabuf_fops, > }; > - > -static int __init udmabuf_dev_init(void) -{ > - int ret; > - > - ret = misc_register(&udmabuf_misc); > - if (ret < 0) { > - pr_err("Could not initialize udmabuf device\n"); > - return ret; > - } > - > - ret = dma_coerce_mask_and_coherent(udmabuf_misc.this_device, > - DMA_BIT_MASK(64)); > - if (ret < 0) { > - pr_err("Could not setup DMA mask for udmabuf device\n"); > - misc_deregister(&udmabuf_misc); > - return ret; > - } > - > - return 0; > -} > - > -static void __exit udmabuf_dev_exit(void) -{ > - misc_deregister(&udmabuf_misc); > -} > - > -module_init(udmabuf_dev_init) > -module_exit(udmabuf_dev_exit) > +module_misc_device(udmabuf_misc); > > MODULE_AUTHOR("Gerd Hoffmann <kraxel@redhat.com>"); > -- > 2.39.2
diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c index ab6764322523c..3028ac3fd9f6a 100644 --- a/drivers/dma-buf/udmabuf.c +++ b/drivers/dma-buf/udmabuf.c @@ -392,34 +392,6 @@ static struct miscdevice udmabuf_misc = { .name = "udmabuf", .fops = &udmabuf_fops, }; - -static int __init udmabuf_dev_init(void) -{ - int ret; - - ret = misc_register(&udmabuf_misc); - if (ret < 0) { - pr_err("Could not initialize udmabuf device\n"); - return ret; - } - - ret = dma_coerce_mask_and_coherent(udmabuf_misc.this_device, - DMA_BIT_MASK(64)); - if (ret < 0) { - pr_err("Could not setup DMA mask for udmabuf device\n"); - misc_deregister(&udmabuf_misc); - return ret; - } - - return 0; -} - -static void __exit udmabuf_dev_exit(void) -{ - misc_deregister(&udmabuf_misc); -} - -module_init(udmabuf_dev_init) -module_exit(udmabuf_dev_exit) +module_misc_device(udmabuf_misc); MODULE_AUTHOR("Gerd Hoffmann <kraxel@redhat.com>");
Now that we do not need to call dma_coerce_mask_and_coherent() on our miscdevice device, use the module_misc_device() helper for registering and module init/exit. Signed-off-by: Andrew Davis <afd@ti.com> --- drivers/dma-buf/udmabuf.c | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-)