Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0af61e66 authored by Paul Gortmaker's avatar Paul Gortmaker Committed by Greg Kroah-Hartman
Browse files

drivers/staging: make emxx_udc.c explicitly non-modular 



The Kconfig currently controlling compilation of this code is:

drivers/staging/emxx_udc/Kconfig:config USB_EMXX
drivers/staging/emxx_udc/Kconfig:       bool "EMXX USB Function Device Controller"

...meaning that it currently is not being built as a module by anyone.

Lets remove the modular code that is essentially orphaned, so that
when reading the driver there is no doubt it is builtin-only.

Since module_platform_driver() uses the same init level priority as
builtin_platform_driver() the init ordering remains unchanged with
this commit.

The .remove function was declared __exit, so it wouldn't have been
available for a sysfs bind/unbind anyway, so lets be explicit here and
use ".suppress_bind_attrs = true" to prevent root from doing something
silly.

We also delete the MODULE_LICENSE tag etc. since all that information
is already contained at the top of the file in the comments.

Cc: Vincenzo Scotti <vinc94@gmail.com>
Cc: Haneen Mohammed <hamohammed.sa@gmail.com>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Roberta Dobrescu <roberta.dobrescu@gmail.com>
Cc: Tapasweni Pathak <tapaswenipathak@gmail.com>
Cc: Peter Chen <peter.chen@freescale.com>
Cc: Robert Baldyga <r.baldyga@samsung.com>
Cc: Chris Rorvick <chris@rorvick.com>
Cc: "Gujulan Elango, Hari Prasath (H.)" <hgujulan@visteon.com>
Cc: devel@driverdev.osuosl.org
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e20ec73a

drivers/staging/emxx_udc/emxx_udc.c

+4 −33
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 */



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/delay.h>

#include <linux/ioport.h>
@@ -40,11 +40,9 @@ 


#include "emxx_udc.h"



#define	DRIVER_DESC	"EMXX UDC driver"

#define	DMA_ADDR_INVALID	(~(dma_addr_t)0)



static const char	driver_name[] = "emxx_udc";

static const char	driver_desc[] = DRIVER_DESC;



/*===========================================================================*/

/* Prototype */
@@ -3320,28 +3318,6 @@ static void nbu2ss_drv_shutdown(struct platform_device *pdev) 
	_nbu2ss_disable_controller(udc);

}



/*-------------------------------------------------------------------------*/

static int __exit nbu2ss_drv_remove(struct platform_device *pdev)

{

	struct nbu2ss_udc	*udc;

	struct nbu2ss_ep	*ep;

	int	i;



	udc = &udc_controller;



	for (i = 0; i < NUM_ENDPOINTS; i++) {

		ep = &udc->ep[i];

		if (ep->virt_buf)

			dma_free_coherent(NULL, PAGE_SIZE,

				(void *)ep->virt_buf, ep->phys_buf);

	}



	/* Interrupt Handler - Release */

	free_irq(INT_VBUS, udc);



	return 0;

}



/*-------------------------------------------------------------------------*/

static int nbu2ss_drv_suspend(struct platform_device *pdev, pm_message_t state)

{
@@ -3394,17 +3370,12 @@ static int nbu2ss_drv_resume(struct platform_device *pdev) 
static struct platform_driver udc_driver = {

	.probe		= nbu2ss_drv_probe,

	.shutdown	= nbu2ss_drv_shutdown,

	.remove		= __exit_p(nbu2ss_drv_remove),

	.suspend	= nbu2ss_drv_suspend,

	.resume		= nbu2ss_drv_resume,

	.driver		= {

		.name			= driver_name,

		.suppress_bind_attrs	= true,

	},

};



module_platform_driver(udc_driver);



MODULE_DESCRIPTION(DRIVER_DESC);

MODULE_AUTHOR("Renesas Electronics Corporation");

MODULE_LICENSE("GPL");

builtin_platform_driver(udc_driver);