Commit Graph

12 Commits

Author SHA1 Message Date
Roger Tseng 355d8ae57b staging: rts5139: fixed issues when config to built-in object
Fixed two issues when CONFIG_RTS5139=y :

  - Makefile doesn't take $(CONFIG_RTS5139). It always uses obj-m and built as
    a loadable module.
  - Rename some symbols with prefix 'rts51x_' to prevent symbol name collisions
    with drivers/staging/rts_pstor when both are configured to be built-in
    objects.

  drivers/staging/rts5139/built-in.o: In function `xd_cleanup_work':
  (.text+0x1435d): multiple definition of `xd_cleanup_work'
  drivers/staging/rts_pstor/built-in.o:(.text+0x2b96a): first defined here
  drivers/staging/rts5139/built-in.o: In function `release_xd_card':
  (.text+0x14393): multiple definition of `release_xd_card'
  drivers/staging/rts_pstor/built-in.o:(.text+0x2c491): first defined here
  drivers/staging/rts5139/built-in.o: In function `set_sense_data':
  (.text+0x1e02): multiple definition of `set_sense_data'
  drivers/staging/rts_pstor/built-in.o:(.text+0xa79f): first defined here
  drivers/staging/rts5139/built-in.o: In function `ms_delay_write':
  ...

Signed-off-by: Roger Tseng <rogerable@realtek.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 15:58:22 -07:00
Erik Jones 3852587ac6 staging: rts5139: rts51x_chip: fixed brace coding style issue
Fixed a coding style issue.

Signed-off-by: Erik Jones <erik@ejnode.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-06-22 21:04:05 -07:00
Oleksij Rempel 0e545f6d16 staging: rts5139: remove unused variable option.ww_enable
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-05-10 09:57:21 -07:00
Oleksij Rempel 711c273c07 staging: rts5139: remove unused rcc_bug_fix_en
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-05-10 09:57:20 -07:00
Oleksij Rempel 63bb174d9c staging: rts5139: remove useless rts51x_sys.h
and move USING_POLLING_CYCLE_DELINK to rts51x_chip.h

Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-05-09 13:26:13 -07:00
Oleksij Rempel ec5bd9b3cf staging: rts5139: remove unused clear_first_install_mark
it also removes rts51x_reset_detected_cards.

Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-05-09 13:26:13 -07:00
Oleksij Rempel a7f625160f staging: rts5139: remove disabled SUPPORT_SD_LOCK code.
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-05-09 13:26:12 -07:00
Oleksij Rempel 3d2b3aacac staging: rts5139: remove unused LED_AUTO_BLINK code
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-05-09 13:26:12 -07:00
Oleksij Rempel 30572230e1 staging: rts5139: remove disabled code in rts51x_chip.c
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-05-09 13:26:12 -07:00
Oleksij Rempel bc5219bdeb staging: rts5139: remove useless functions in rts51x_card.c
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-05-09 13:26:11 -07:00
Márton Németh aa2f92ae6b staging: rts5139: fix pointer coding style
This will remove the following checkpatch.pl error:
ERROR: "foo * bar" should be "foo *bar"

Signed-off-by: Márton Németh <nm127@freemail.hu>
Acked-by: edwin_rong <edwin_rong@realsil.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-02-09 09:41:34 -08:00
edwin_rong 1dac4186bc Staging: add driver for Realtek RTS5139 cardreader
This driver is used for Realtek RTS5139 USB cardreader, which
supports many cards, such as SD, MS, XD series cards.

Signed-off-by: edwin_rong <edwin_rong@realsil.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23 12:11:46 -07:00