tree: git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next.git master
head: 871e11b1a27ff07efb1d23944952a288fdb02845
commit: 49aa75f13ab9eb5f5ad19c69998dd3cf6403942e [5/6] NFC: pn544: i2c: Add
device-tree (Open Firmware) support to PN544
drivers/nfc/pn544/i2c.c:1032 pn544_hci_i2c_probe() error: we previously assumed
'pdata' could be null (see line 980)
git remote add nfc-next
git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next.git
git remote update nfc-next
git checkout 49aa75f13ab9eb5f5ad19c69998dd3cf6403942e
vim +/pdata +1032 drivers/nfc/pn544/i2c.c
97f18414 Eric Lapuyade 2012-10-02 974 phy->i2c_dev = client;
97f18414 Eric Lapuyade 2012-10-02 975 i2c_set_clientdata(client, phy);
97f18414 Eric Lapuyade 2012-10-02 976
97f18414 Eric Lapuyade 2012-10-02 977 pdata =
client->dev.platform_data;
97f18414 Eric Lapuyade 2012-10-02 978
49aa75f1 Clement Perrochaud 2014-04-02 979 /* No platform data, using
device tree. */
49aa75f1 Clement Perrochaud 2014-04-02 @980 if (!pdata &&
client->dev.of_node) {
49aa75f1 Clement Perrochaud 2014-04-02 981 r =
pn544_hci_i2c_of_request_resources(client);
49aa75f1 Clement Perrochaud 2014-04-02 982 if (r) {
49aa75f1 Clement Perrochaud 2014-04-02 983
nfc_err(&client->dev, "No DT data\n");
49aa75f1 Clement Perrochaud 2014-04-02 984 return r;
49aa75f1 Clement Perrochaud 2014-04-02 985 }
49aa75f1 Clement Perrochaud 2014-04-02 986 /* Using platform data. */
49aa75f1 Clement Perrochaud 2014-04-02 987 } else if (pdata) {
97f18414 Eric Lapuyade 2012-10-02 988
49aa75f1 Clement Perrochaud 2014-04-02 989 if
(pdata->request_resources == NULL) {
49aa75f1 Clement Perrochaud 2014-04-02 990
nfc_err(&client->dev, "request_resources() missing\n");
49aa75f1 Clement Perrochaud 2014-04-02 991 return -EINVAL;
49aa75f1 Clement Perrochaud 2014-04-02 992 }
49aa75f1 Clement Perrochaud 2014-04-02 993
49aa75f1 Clement Perrochaud 2014-04-02 994 r =
pdata->request_resources(client);
49aa75f1 Clement Perrochaud 2014-04-02 995 if (r) {
49aa75f1 Clement Perrochaud 2014-04-02 996
nfc_err(&client->dev,
49aa75f1 Clement Perrochaud 2014-04-02 997 "Cannot
get platform resources\n");
49aa75f1 Clement Perrochaud 2014-04-02 998 return r;
49aa75f1 Clement Perrochaud 2014-04-02 999 }
97f18414 Eric Lapuyade 2012-10-02 1000
49aa75f1 Clement Perrochaud 2014-04-02 1001 phy->gpio_en =
pdata->get_gpio(NFC_GPIO_ENABLE);
49aa75f1 Clement Perrochaud 2014-04-02 1002 phy->gpio_fw =
pdata->get_gpio(NFC_GPIO_FW_RESET);
49aa75f1 Clement Perrochaud 2014-04-02 1003 phy->gpio_irq =
pdata->get_gpio(NFC_GPIO_IRQ);
49aa75f1 Clement Perrochaud 2014-04-02 1004 } else {
49aa75f1 Clement Perrochaud 2014-04-02 1005 nfc_err(&client->dev,
"No platform data\n");
49aa75f1 Clement Perrochaud 2014-04-02 1006 return -EINVAL;
49aa75f1 Clement Perrochaud 2014-04-02 1007 }
97f18414 Eric Lapuyade 2012-10-02 1008
97f18414 Eric Lapuyade 2012-10-02 1009
pn544_hci_i2c_platform_init(phy);
97f18414 Eric Lapuyade 2012-10-02 1010
97f18414 Eric Lapuyade 2012-10-02 1011 r =
request_threaded_irq(client->irq, NULL, pn544_hci_i2c_irq_thread_fn,
97f18414 Eric Lapuyade 2012-10-02 1012
IRQF_TRIGGER_RISING | IRQF_ONESHOT,
97f18414 Eric Lapuyade 2012-10-02 1013
PN544_HCI_I2C_DRIVER_NAME, phy);
97f18414 Eric Lapuyade 2012-10-02 1014 if (r < 0) {
17936b43 Joe Perches 2013-04-05 1015 nfc_err(&client->dev,
"Unable to register IRQ handler\n");
97f18414 Eric Lapuyade 2012-10-02 1016 goto err_rti;
97f18414 Eric Lapuyade 2012-10-02 1017 }
97f18414 Eric Lapuyade 2012-10-02 1018
97f18414 Eric Lapuyade 2012-10-02 1019 r = pn544_hci_probe(phy,
&i2c_phy_ops, LLC_SHDLC_NAME,
97f18414 Eric Lapuyade 2012-10-02 1020
PN544_I2C_FRAME_HEADROOM, PN544_I2C_FRAME_TAILROOM,
06c66034 Eric Lapuyade 2013-07-19 1021
PN544_HCI_I2C_LLC_MAX_PAYLOAD,
06c66034 Eric Lapuyade 2013-07-19 1022
pn544_hci_i2c_fw_download, &phy->hdev);
97f18414 Eric Lapuyade 2012-10-02 1023 if (r < 0)
97f18414 Eric Lapuyade 2012-10-02 1024 goto err_hci;
97f18414 Eric Lapuyade 2012-10-02 1025
97f18414 Eric Lapuyade 2012-10-02 1026 return 0;
97f18414 Eric Lapuyade 2012-10-02 1027
97f18414 Eric Lapuyade 2012-10-02 1028 err_hci:
97f18414 Eric Lapuyade 2012-10-02 1029 free_irq(client->irq, phy);
97f18414 Eric Lapuyade 2012-10-02 1030
97f18414 Eric Lapuyade 2012-10-02 1031 err_rti:
97f18414 Eric Lapuyade 2012-10-02 @1032 if (pdata->free_resources !=
NULL)
97f18414 Eric Lapuyade 2012-10-02 1033 pdata->free_resources();
97f18414 Eric Lapuyade 2012-10-02 1034
97f18414 Eric Lapuyade 2012-10-02 1035 return r;
---
0-DAY kernel build testing backend Open Source Technology Center
http://lists.01.org/mailman/listinfo/kbuild Intel Corporation
_______________________________________________
kbuild mailing list
kbuild@lists.01.org
https://lists.01.org/mailman/listinfo/kbuild
