pm24.git/drivers/nfc/pn544, branch v3.9

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

2013-01-28T19:43:00Z

NFC: Initial Secure Element API

2013-01-09T23:51:54Z

Each NFC adapter can have several links to different secure elements and that property needs to be exported by the drivers. A secure element link can be enabled and disabled, and card emulation will be handled by the currently active one. Otherwise card emulation will be host implemented. Signed-off-by: Samuel Ortiz

NFC: pn544: Use devm_kzalloc API

2013-01-09T23:51:53Z

Signed-off-by: Samuel Ortiz

NFC: pn544: Use module_i2c_driver

2013-01-09T23:51:52Z

The pn544 init routine does nothing but adding the driver to the i2c bus. Signed-off-by: Samuel Ortiz

NFC: pn544: Separate the core code and the i2c one into different modules

2013-01-09T23:51:52Z

As we may need to support other physical layers, we can avoid linking the core part into each and every pn544 module. Signed-off-by: Samuel Ortiz

NFC: Add HCI quirks to support driver (non)standard implementations

2013-01-09T23:51:51Z

Some chips diverge from the HCI spec in their implementation of standard features. This adds a new quirks parameter to nfc_hci_allocate_device() to let the driver indicate its divergence. Signed-off-by: Eric Lapuyade Signed-off-by: Samuel Ortiz

NFC: Fixed skb leak in tm_send() nfc and hci ops implementations

2013-01-09T23:51:50Z

Signed-off-by: Eric Lapuyade Signed-off-by: Samuel Ortiz

NFC: Changed event_received hci ops result semantic

2013-01-09T23:51:49Z

Some chips use a standard HCI event code, destined to a proprietary gate, with a different meaning. Therefore, the HCI driver must always have a chance to intercept the event before standard processing is attempted. The new semantic specifies that the result value "1" means that the driver doesn't especially handle the event. result <= 0 means it was handled. Signed-off-by: Eric Lapuyade Signed-off-by: Samuel Ortiz

NFC: Added error handling in event_received hci ops

2013-01-09T23:51:49Z

There is no use to return an error if the caller doesn't get it. Signed-off-by: Samuel Ortiz

Drivers: misc: remove __dev* attributes.

2013-01-03T23:57:16Z

CONFIG_HOTPLUG is going away as an option. As a result, the __dev* markings need to be removed. This change removes the use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit from these drivers. Based on patches originally written by Bill Pemberton, but redone by me in order to handle some of the coding style issues better, by hand. Cc: Bill Pemberton Signed-off-by: Greg Kroah-Hartman