Skip to content

Commit

Permalink
NFC: Remove the pn544 raw driver
Browse files Browse the repository at this point in the history
This was scheduled for 3.6, we're late.

Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
  • Loading branch information
Cong Wang authored and Samuel Ortiz committed Sep 24, 2012
1 parent 80faa59 commit 7b55279
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 918 deletions.
12 changes: 0 additions & 12 deletions Documentation/feature-removal-schedule.txt
Original file line number Diff line number Diff line change
Expand Up @@ -516,18 +516,6 @@ Who: Kees Cook <keescook@chromium.org>

----------------------------

What: Removing the pn544 raw driver.
When: 3.6
Why: With the introduction of the NFC HCI and SHDL kernel layers, pn544.c
is being replaced by pn544_hci.c which is accessible through the netlink
and socket NFC APIs. Moreover, pn544.c is outdated and does not seem to
work properly with the latest Android stacks.
Having 2 drivers for the same hardware is confusing and as such we
should only keep the one following the kernel NFC APIs.
Who: Samuel Ortiz <sameo@linux.intel.com>

----------------------------

What: setitimer accepts user NULL pointer (value)
When: 3.6
Why: setitimer is not returning -EFAULT if user pointer is NULL. This
Expand Down
12 changes: 0 additions & 12 deletions drivers/nfc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,6 @@
menu "Near Field Communication (NFC) devices"
depends on NFC

config PN544_NFC
tristate "PN544 NFC driver"
depends on I2C
select CRC_CCITT
default n
---help---
Say yes if you want PN544 Near Field Communication driver.
This is for i2c connected version. If unsure, say N here.

To compile this driver as a module, choose m here. The module will
be called pn544.

config PN544_HCI_NFC
tristate "HCI PN544 NFC driver"
depends on I2C && NFC_HCI && NFC_SHDLC
Expand Down
1 change: 0 additions & 1 deletion drivers/nfc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# Makefile for nfc devices
#

obj-$(CONFIG_PN544_NFC) += pn544.o
obj-$(CONFIG_PN544_HCI_NFC) += pn544_hci.o
obj-$(CONFIG_NFC_PN533) += pn533.o
obj-$(CONFIG_NFC_WILINK) += nfcwilink.o
Expand Down
Loading

0 comments on commit 7b55279

Please sign in to comment.