File tree Expand file tree Collapse file tree 1 file changed +2
-5
lines changed Expand file tree Collapse file tree 1 file changed +2
-5
lines changed Original file line number Diff line number Diff line change 14
14
#include <linux/io.h>
15
15
#include <linux/interrupt.h>
16
16
#include <linux/of.h>
17
- #include <linux/of_device .h>
17
+ #include <linux/property .h>
18
18
#include <linux/clk.h>
19
19
#include <linux/slab.h>
20
20
#include <linux/input/matrix_keypad.h>
@@ -602,9 +602,6 @@ static int tegra_kbc_probe(struct platform_device *pdev)
602
602
unsigned int debounce_cnt ;
603
603
unsigned int scan_time_rows ;
604
604
unsigned int keymap_rows ;
605
- const struct of_device_id * match ;
606
-
607
- match = of_match_device (tegra_kbc_of_match , & pdev -> dev );
608
605
609
606
kbc = devm_kzalloc (& pdev -> dev , sizeof (* kbc ), GFP_KERNEL );
610
607
if (!kbc ) {
@@ -613,7 +610,7 @@ static int tegra_kbc_probe(struct platform_device *pdev)
613
610
}
614
611
615
612
kbc -> dev = & pdev -> dev ;
616
- kbc -> hw_support = match -> data ;
613
+ kbc -> hw_support = device_get_match_data ( & pdev -> dev ) ;
617
614
kbc -> max_keys = kbc -> hw_support -> max_rows *
618
615
kbc -> hw_support -> max_columns ;
619
616
kbc -> num_rows_and_columns = kbc -> hw_support -> max_rows +
You can’t perform that action at this time.
0 commit comments