staging: dgap: uses kzalloc for allocating memory

Originally, this driver created it's own allocating
function. This patch removes that function and calls
kzalloc directly.

This patch affects:
 - driver.c
 - driver.h
 - fep5.c
 - tty.c

Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/dgap/dgap_driver.c b/drivers/staging/dgap/dgap_driver.c
index 4c1515ee56e58a9e2d00f7385cb3494ac1a392bb..089d017fc2915aa66e3e96f989999a06f0aeb1bc 100644 (file)
--- a/drivers/staging/dgap/dgap_driver.c
+++ b/drivers/staging/dgap/dgap_driver.c
@@ -506,7 +506,7 @@ static int dgap_found_board(struct pci_dev *pdev, int id)
 
        /* get the board structure and prep it */
        brd = dgap_Board[dgap_NumBoards] =
-       (struct board_t *) dgap_driver_kzmalloc(sizeof(struct board_t), GFP_KERNEL);
+       (struct board_t *) kzalloc(sizeof(struct board_t), GFP_KERNEL);
        if (!brd) {
                APR(("memory allocation for board structure failed\n"));
                return(-ENOMEM);
@@ -514,7 +514,7 @@ static int dgap_found_board(struct pci_dev *pdev, int id)
 
        /* make a temporary message buffer for the boot messages */
        brd->msgbuf = brd->msgbuf_head =
-               (char *) dgap_driver_kzmalloc(sizeof(char) * 8192, GFP_KERNEL);
+               (char *) kzalloc(sizeof(char) * 8192, GFP_KERNEL);
        if(!brd->msgbuf) {
                kfree(brd);
                APR(("memory allocation for board msgbuf failed\n"));
@@ -924,20 +924,6 @@ static void dgap_init_globals(void)
  ************************************************************************/
 
 
-/*
- * dgap_driver_kzmalloc()
- *
- * Malloc and clear memory,
- */
-void *dgap_driver_kzmalloc(size_t size, int priority)
-{
-       void *p = kmalloc(size, priority);
-       if(p)
-               memset(p, 0, size);
-       return(p);
-}
-
-
 /*
  * dgap_mbuf()
  *

diff --git a/drivers/staging/dgap/dgap_driver.h b/drivers/staging/dgap/dgap_driver.h
index 7d631e80c00e8856dda9136cf14117250f4fc81d..2f7a55a7e40daac935c19f8be332de924ab9c8af 100644 (file)
--- a/drivers/staging/dgap/dgap_driver.h
+++ b/drivers/staging/dgap/dgap_driver.h
@@ -578,7 +578,6 @@ struct channel_t {
  *************************************************************************/
 
 extern int             dgap_ms_sleep(ulong ms);
-extern void            *dgap_driver_kzmalloc(size_t size, int priority);
 extern char            *dgap_ioctl_name(int cmd);
 extern void            dgap_do_bios_load(struct board_t *brd, uchar __user *ubios, int len);
 extern void            dgap_do_fep_load(struct board_t *brd, uchar __user *ufep, int len);

diff --git a/drivers/staging/dgap/dgap_fep5.c b/drivers/staging/dgap/dgap_fep5.c
index 794cf9db8b8308f63c494759bacbd101296552af..15f9a8512313b8ce24eae4ef0aefa5e3e3a55e8b 100644 (file)
--- a/drivers/staging/dgap/dgap_fep5.c
+++ b/drivers/staging/dgap/dgap_fep5.c
@@ -75,7 +75,7 @@ void dgap_do_config_load(uchar __user *uaddr, int len)
        char buf[U2BSIZE];
        int n;
 
-       to_addr = dgap_config_buf = dgap_driver_kzmalloc(len + 1, GFP_ATOMIC);
+       to_addr = dgap_config_buf = kzalloc(len + 1, GFP_ATOMIC);
        if (!dgap_config_buf) {
                DPR_INIT(("dgap_do_config_load - unable to allocate memory for file\n"));
                dgap_driver_state = DRIVER_NEED_CONFIG_LOAD;
@@ -130,8 +130,8 @@ int dgap_after_config_loaded(void)
                /*
                 * allocate flip buffer for board.
                 */
-               dgap_Board[i]->flipbuf = dgap_driver_kzmalloc(MYFLIPLEN, GFP_ATOMIC);
-               dgap_Board[i]->flipflagbuf = dgap_driver_kzmalloc(MYFLIPLEN, GFP_ATOMIC);
+               dgap_Board[i]->flipbuf = kzalloc(MYFLIPLEN, GFP_ATOMIC);
+               dgap_Board[i]->flipflagbuf = kzalloc(MYFLIPLEN, GFP_ATOMIC);
        }
 
        return rc;

diff --git a/drivers/staging/dgap/dgap_tty.c b/drivers/staging/dgap/dgap_tty.c
index c64296f7013867c79d6480cf0fcd7fd83b29be45..39fb4dfb8b7e1c5126b44a64a628e01b02821fb5 100644 (file)
--- a/drivers/staging/dgap/dgap_tty.c
+++ b/drivers/staging/dgap/dgap_tty.c
@@ -233,7 +233,7 @@ int dgap_tty_register(struct board_t *brd)
        brd->SerialDriver->flags = (TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV | TTY_DRIVER_HARDWARE_BREAK);
 
        /* The kernel wants space to store pointers to tty_structs */
-       brd->SerialDriver->ttys = dgap_driver_kzmalloc(MAXPORTS * sizeof(struct tty_struct *), GFP_KERNEL);
+       brd->SerialDriver->ttys = kzalloc(MAXPORTS * sizeof(struct tty_struct *), GFP_KERNEL);
        if (!brd->SerialDriver->ttys)
                return(-ENOMEM);
 
@@ -266,7 +266,7 @@ int dgap_tty_register(struct board_t *brd)
        brd->PrintDriver->flags = (TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV | TTY_DRIVER_HARDWARE_BREAK);
 
        /* The kernel wants space to store pointers to tty_structs */
-       brd->PrintDriver->ttys = dgap_driver_kzmalloc(MAXPORTS * sizeof(struct tty_struct *), GFP_KERNEL);
+       brd->PrintDriver->ttys = kzalloc(MAXPORTS * sizeof(struct tty_struct *), GFP_KERNEL);
        if (!brd->PrintDriver->ttys)
                return(-ENOMEM);
 
@@ -380,7 +380,7 @@ int dgap_tty_init(struct board_t *brd)
         */
        for (i = 0; i < brd->nasync; i++) {
                if (!brd->channels[i]) {
-                       brd->channels[i] = dgap_driver_kzmalloc(sizeof(struct channel_t), GFP_ATOMIC);
+                       brd->channels[i] = kzalloc(sizeof(struct channel_t), GFP_ATOMIC);
                        if (!brd->channels[i]) {
                                DPR_CORE(("%s:%d Unable to allocate memory for channel struct\n",
                                    __FILE__, __LINE__));