microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

nfc: constify nfc_ops 

Neither the core nor the drivers modify the passed pointer to struct
nfc_ops, so make it a pointer to const for correctness and safety.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Krzysztof Kozlowski 2021-07-24 23:49:25 +02:00 коммит произвёл David S. Miller
Родитель 5f3e639337
Коммит f6c802a726
6 изменённых файлов: 7 добавлений и 7 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
drivers/nfc/pn533/pn533.c
Просмотреть файл

@ -2623,7 +2623,7 @@ static int pn533_dev_down(struct nfc_dev *nfc_dev)
return ret; return ret;
} }
static struct nfc_ops pn533_nfc_ops = { static const struct nfc_ops pn533_nfc_ops = {
.dev_up = pn533_dev_up, .dev_up = pn533_dev_up,
.dev_down = pn533_dev_down, .dev_down = pn533_dev_down,
.dep_link_up = pn533_dep_link_up, .dep_link_up = pn533_dep_link_up,

4
include/net/nfc/nfc.h
Просмотреть файл

@ -191,14 +191,14 @@ struct nfc_dev {
const struct nfc_vendor_cmd *vendor_cmds; const struct nfc_vendor_cmd *vendor_cmds;
int n_vendor_cmds; int n_vendor_cmds;
struct nfc_ops *ops; const struct nfc_ops *ops;
struct genl_info *cur_cmd_info; struct genl_info *cur_cmd_info;
}; };
#define to_nfc_dev(_dev) container_of(_dev, struct nfc_dev, dev) #define to_nfc_dev(_dev) container_of(_dev, struct nfc_dev, dev)
extern struct class nfc_class; extern struct class nfc_class;
struct nfc_dev *nfc_allocate_device(struct nfc_ops *ops, struct nfc_dev *nfc_allocate_device(const struct nfc_ops *ops,
u32 supported_protocols, u32 supported_protocols,
int tx_headroom, int tx_headroom,
int tx_tailroom); int tx_tailroom);

2
net/nfc/core.c
Просмотреть файл

@ -1048,7 +1048,7 @@ struct nfc_dev *nfc_get_device(unsigned int idx)
* @tx_headroom: reserved space at beginning of skb * @tx_headroom: reserved space at beginning of skb
* @tx_tailroom: reserved space at end of skb * @tx_tailroom: reserved space at end of skb
*/ */
struct nfc_dev *nfc_allocate_device(struct nfc_ops *ops, struct nfc_dev *nfc_allocate_device(const struct nfc_ops *ops,
u32 supported_protocols, u32 supported_protocols,
int tx_headroom, int tx_tailroom) int tx_headroom, int tx_tailroom)
{ {

2
net/nfc/digital_core.c
Просмотреть файл

@ -732,7 +732,7 @@ exit:
return rc; return rc;
} }
static struct nfc_ops digital_nfc_ops = { static const struct nfc_ops digital_nfc_ops = {
.dev_up = digital_dev_up, .dev_up = digital_dev_up,
.dev_down = digital_dev_down, .dev_down = digital_dev_down,
.start_poll = digital_start_poll, .start_poll = digital_start_poll,

2
net/nfc/hci/core.c
Просмотреть файл

@ -928,7 +928,7 @@ static int hci_fw_download(struct nfc_dev *nfc_dev, const char *firmware_name)
return hdev->ops->fw_download(hdev, firmware_name); return hdev->ops->fw_download(hdev, firmware_name);
} }
static struct nfc_ops hci_nfc_ops = { static const struct nfc_ops hci_nfc_ops = {
.dev_up = hci_dev_up, .dev_up = hci_dev_up,
.dev_down = hci_dev_down, .dev_down = hci_dev_down,
.start_poll = hci_start_poll, .start_poll = hci_start_poll,

2
net/nfc/nci/core.c
Просмотреть файл

@ -1102,7 +1102,7 @@ static int nci_fw_download(struct nfc_dev *nfc_dev, const char *firmware_name)
return ndev->ops->fw_download(ndev, firmware_name); return ndev->ops->fw_download(ndev, firmware_name);
} }
static struct nfc_ops nci_nfc_ops = { static const struct nfc_ops nci_nfc_ops = {
.dev_up = nci_dev_up, .dev_up = nci_dev_up,
.dev_down = nci_dev_down, .dev_down = nci_dev_down,
.start_poll = nci_start_poll, .start_poll = nci_start_poll,