Commit 6afce196 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'nfc-next-4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next 



Samuel Ortiz says:

====================
NFC 4.15 pull request

This is the NFC pull request for 4.15. We have:

- A new netlink command for explicitly deactivating NFC targets
- i2c constification for all NFC drivers
- One NFC device allocation error path fix
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents fd9080a3 4d63adfe

drivers/nfc/fdp/fdp.c

+1 −1
Original line number Diff line number Diff line
@@ -726,7 +726,7 @@ static struct nci_driver_ops fdp_prop_ops[] = { 
	},

};



struct nci_ops nci_ops = {

static struct nci_ops nci_ops = {

	.open = fdp_nci_open,

	.close = fdp_nci_close,

	.send = fdp_nci_send,

drivers/nfc/microread/i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ static int microread_i2c_remove(struct i2c_client *client) 
	return 0;

}



static struct i2c_device_id microread_i2c_id[] = {

static const struct i2c_device_id microread_i2c_id[] = {

	{ MICROREAD_I2C_DRIVER_NAME, 0},

	{ }

};

drivers/nfc/nfcmrvl/i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ static const struct of_device_id of_nfcmrvl_i2c_match[] = { 
};

MODULE_DEVICE_TABLE(of, of_nfcmrvl_i2c_match);



static struct i2c_device_id nfcmrvl_i2c_id_table[] = {

static const struct i2c_device_id nfcmrvl_i2c_id_table[] = {

	{ "nfcmrvl_i2c", 0 },

	{}

};

drivers/nfc/nxp-nci/i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ static int nxp_nci_i2c_remove(struct i2c_client *client) 
	return 0;

}



static struct i2c_device_id nxp_nci_i2c_id_table[] = {

static const struct i2c_device_id nxp_nci_i2c_id_table[] = {

	{"nxp-nci_i2c", 0},

	{}

};

drivers/nfc/pn533/i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ static const struct of_device_id of_pn533_i2c_match[] = { 
};

MODULE_DEVICE_TABLE(of, of_pn533_i2c_match);



static struct i2c_device_id pn533_i2c_id_table[] = {

static const struct i2c_device_id pn533_i2c_id_table[] = {

	{ PN533_I2C_DRIVER_NAME, 0 },

	{}

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE