2014-03-10

sparse reported dgap_do_fep_load is redeclared with different type. while

fixing, I noticed __user attribute is used incorrectly in declaration.

There is no need to define __user for firware->data.

Replaced the __user with 'const uchar *' from function dgap_do_fep_load and

did the same for function dgap_do_bios_load.

Signed-off-by: Masood Mehmood <ody.guru@gmail.com>

---

drivers/staging/dgap/dgap.c | 13 ++++++-------

1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c

index d00283a..ab81479 100644

--- a/drivers/staging/dgap/dgap.c

+++ b/drivers/staging/dgap/dgap.c

@@ -210,9 +210,8 @@ static uint dgap_config_get_useintr(struct board_t *bd);

static uint dgap_config_get_altpin(struct board_t *bd);

static int dgap_ms_sleep(ulong ms);

-static void dgap_do_bios_load(struct board_t *brd, uchar __user *ubios,

- int len);

-static void dgap_do_fep_load(struct board_t *brd, uchar __user *ufep, int len);

+static void dgap_do_bios_load(struct board_t *brd, const uchar *ubios, int len);

+static void dgap_do_fep_load(struct board_t *brd, const uchar *ufep, int len);

#ifdef DIGI_CONCENTRATORS_SUPPORTED

static void dgap_do_conc_load(struct board_t *brd, uchar *uaddr, int len);

#endif

@@ -935,7 +934,7 @@ static int dgap_firmware_load(struct pci_dev *pdev, int card_type)

fw_info[card_type].bios_name);

return ret;

}

- dgap_do_bios_load(brd, (char *)fw->data, fw->size);

+ dgap_do_bios_load(brd, fw->data, fw->size);

release_firmware(fw);

/* Wait for BIOS to test board... */

@@ -953,7 +952,7 @@ static int dgap_firmware_load(struct pci_dev *pdev, int card_type)

fw_info[card_type].fep_name);

return ret;

}

- dgap_do_fep_load(brd, (char *)fw->data, fw->size);

+ dgap_do_fep_load(brd, fw->data, fw->size);

release_firmware(fw);

/* Wait for FEP to load on board... */

@@ -4349,7 +4348,7 @@ static int dgap_tty_register_ports(struct board_t *brd)

* Copies the BIOS code from the user to the board,

* and starts the BIOS running.

*/

-static void dgap_do_bios_load(struct board_t *brd, uchar __user *ubios, int len)

+static void dgap_do_bios_load(struct board_t *brd, const uchar *ubios, int len)

{

uchar *addr;

uint offset;

@@ -4425,7 +4424,7 @@ static void dgap_do_wait_for_bios(struct board_t *brd)

* Copies the FEP code from the user to the board,

* and starts the FEP running.

*/

-static void dgap_do_fep_load(struct board_t *brd, uchar *ufep, int len)

+static void dgap_do_fep_load(struct board_t *brd, const uchar *ufep, int len)

{

uchar *addr;

uint offset;

--

1.8.3.1

--

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in

the body of a message to majordomo@vger.kernel.org

More majordomo info at http://vger.kernel.org/majordomo-info.html

Please read the FAQ at http://www.tux.org/lkml/

Show more