mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	rtc: Switch i2c drivers back to use .probe()
After commitb8a1a4cd5a("i2c: Provide a temporary .probe_new() call-back type"), all drivers being converted to .probe_new() and then03c835f498("i2c: Switch .probe() to not take an id parameter") convert back to (the new) .probe() to be able to eventually drop .probe_new() from struct i2c_driver. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Link: https://lore.kernel.org/r/20230505121136.1185653-1-u.kleine-koenig@pengutronix.de Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
This commit is contained in:
		
							parent
							
								
									b191189657
								
							
						
					
					
						commit
						31b0cecb40
					
				
					 35 changed files with 35 additions and 35 deletions
				
			
		| 
						 | 
				
			
			@ -944,7 +944,7 @@ static struct i2c_driver abb5zes3_driver = {
 | 
			
		|||
		.pm = &abb5zes3_rtc_pm_ops,
 | 
			
		||||
		.of_match_table = of_match_ptr(abb5zes3_dt_match),
 | 
			
		||||
	},
 | 
			
		||||
	.probe_new = abb5zes3_probe,
 | 
			
		||||
	.probe = abb5zes3_probe,
 | 
			
		||||
	.id_table = abb5zes3_id,
 | 
			
		||||
};
 | 
			
		||||
module_i2c_driver(abb5zes3_driver);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -584,7 +584,7 @@ static struct i2c_driver abeoz9_driver = {
 | 
			
		|||
		.name = "rtc-ab-eoz9",
 | 
			
		||||
		.of_match_table = of_match_ptr(abeoz9_dt_match),
 | 
			
		||||
	},
 | 
			
		||||
	.probe_new = abeoz9_probe,
 | 
			
		||||
	.probe = abeoz9_probe,
 | 
			
		||||
	.id_table = abeoz9_id,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -992,7 +992,7 @@ static struct i2c_driver abx80x_driver = {
 | 
			
		|||
		.name	= "rtc-abx80x",
 | 
			
		||||
		.of_match_table = of_match_ptr(abx80x_of_match),
 | 
			
		||||
	},
 | 
			
		||||
	.probe_new	= abx80x_probe,
 | 
			
		||||
	.probe		= abx80x_probe,
 | 
			
		||||
	.id_table	= abx80x_id,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -320,7 +320,7 @@ static struct i2c_driver bq32k_driver = {
 | 
			
		|||
		.name	= "bq32k",
 | 
			
		||||
		.of_match_table = of_match_ptr(bq32k_of_match),
 | 
			
		||||
	},
 | 
			
		||||
	.probe_new	= bq32k_probe,
 | 
			
		||||
	.probe		= bq32k_probe,
 | 
			
		||||
	.remove		= bq32k_remove,
 | 
			
		||||
	.id_table	= bq32k_id,
 | 
			
		||||
};
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2011,7 +2011,7 @@ static struct i2c_driver ds1307_driver = {
 | 
			
		|||
		.name	= "rtc-ds1307",
 | 
			
		||||
		.of_match_table = ds1307_of_match,
 | 
			
		||||
	},
 | 
			
		||||
	.probe_new	= ds1307_probe,
 | 
			
		||||
	.probe		= ds1307_probe,
 | 
			
		||||
	.id_table	= ds1307_id,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -572,7 +572,7 @@ static struct i2c_driver ds1374_driver = {
 | 
			
		|||
		.of_match_table = of_match_ptr(ds1374_of_match),
 | 
			
		||||
		.pm = &ds1374_pm,
 | 
			
		||||
	},
 | 
			
		||||
	.probe_new = ds1374_probe,
 | 
			
		||||
	.probe = ds1374_probe,
 | 
			
		||||
	.remove = ds1374_remove,
 | 
			
		||||
	.id_table = ds1374_id,
 | 
			
		||||
};
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -149,7 +149,7 @@ static struct i2c_driver ds1672_driver = {
 | 
			
		|||
		   .name = "rtc-ds1672",
 | 
			
		||||
		   .of_match_table = of_match_ptr(ds1672_of_match),
 | 
			
		||||
	},
 | 
			
		||||
	.probe_new = ds1672_probe,
 | 
			
		||||
	.probe = ds1672_probe,
 | 
			
		||||
	.id_table = ds1672_id,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -603,7 +603,7 @@ static struct i2c_driver ds3232_driver = {
 | 
			
		|||
		.of_match_table = of_match_ptr(ds3232_of_match),
 | 
			
		||||
		.pm	= &ds3232_pm_ops,
 | 
			
		||||
	},
 | 
			
		||||
	.probe_new = ds3232_i2c_probe,
 | 
			
		||||
	.probe = ds3232_i2c_probe,
 | 
			
		||||
	.id_table = ds3232_id,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -147,7 +147,7 @@ static struct i2c_driver em3027_driver = {
 | 
			
		|||
		   .name = "rtc-em3027",
 | 
			
		||||
		   .of_match_table = of_match_ptr(em3027_of_match),
 | 
			
		||||
	},
 | 
			
		||||
	.probe_new = em3027_probe,
 | 
			
		||||
	.probe = em3027_probe,
 | 
			
		||||
	.id_table = em3027_id,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -517,7 +517,7 @@ static struct i2c_driver fm3130_driver = {
 | 
			
		|||
	.driver = {
 | 
			
		||||
		.name	= "rtc-fm3130",
 | 
			
		||||
	},
 | 
			
		||||
	.probe_new	= fm3130_probe,
 | 
			
		||||
	.probe		= fm3130_probe,
 | 
			
		||||
	.id_table	= fm3130_id,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -576,7 +576,7 @@ static struct i2c_driver hym8563_driver = {
 | 
			
		|||
		.pm	= &hym8563_pm_ops,
 | 
			
		||||
		.of_match_table	= hym8563_dt_idtable,
 | 
			
		||||
	},
 | 
			
		||||
	.probe_new	= hym8563_probe,
 | 
			
		||||
	.probe		= hym8563_probe,
 | 
			
		||||
	.id_table	= hym8563_id,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -262,7 +262,7 @@ static struct i2c_driver isl12022_driver = {
 | 
			
		|||
		.name	= "rtc-isl12022",
 | 
			
		||||
		.of_match_table = isl12022_dt_match,
 | 
			
		||||
	},
 | 
			
		||||
	.probe_new	= isl12022_probe,
 | 
			
		||||
	.probe		= isl12022_probe,
 | 
			
		||||
	.id_table	= isl12022_id,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -490,7 +490,7 @@ static struct i2c_driver isl12026_driver = {
 | 
			
		|||
		.name	= "rtc-isl12026",
 | 
			
		||||
		.of_match_table = isl12026_dt_match,
 | 
			
		||||
	},
 | 
			
		||||
	.probe_new	= isl12026_probe_new,
 | 
			
		||||
	.probe		= isl12026_probe_new,
 | 
			
		||||
	.remove		= isl12026_remove,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -908,7 +908,7 @@ static struct i2c_driver isl1208_driver = {
 | 
			
		|||
		.name = "rtc-isl1208",
 | 
			
		||||
		.of_match_table = of_match_ptr(isl1208_of_match),
 | 
			
		||||
	},
 | 
			
		||||
	.probe_new = isl1208_probe,
 | 
			
		||||
	.probe = isl1208_probe,
 | 
			
		||||
	.id_table = isl1208_id,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1013,7 +1013,7 @@ static struct i2c_driver m41t80_driver = {
 | 
			
		|||
		.of_match_table = of_match_ptr(m41t80_of_match),
 | 
			
		||||
		.pm = &m41t80_pm,
 | 
			
		||||
	},
 | 
			
		||||
	.probe_new = m41t80_probe,
 | 
			
		||||
	.probe = m41t80_probe,
 | 
			
		||||
	.remove = m41t80_remove,
 | 
			
		||||
	.id_table = m41t80_id,
 | 
			
		||||
};
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -224,7 +224,7 @@ static struct i2c_driver max6900_driver = {
 | 
			
		|||
	.driver = {
 | 
			
		||||
		   .name = "rtc-max6900",
 | 
			
		||||
		   },
 | 
			
		||||
	.probe_new = max6900_probe,
 | 
			
		||||
	.probe = max6900_probe,
 | 
			
		||||
	.id_table = max6900_id,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -540,7 +540,7 @@ static struct i2c_driver nct3018y_driver = {
 | 
			
		|||
		.name	= "rtc-nct3018y",
 | 
			
		||||
		.of_match_table = of_match_ptr(nct3018y_of_match),
 | 
			
		||||
	},
 | 
			
		||||
	.probe_new	= nct3018y_probe,
 | 
			
		||||
	.probe		= nct3018y_probe,
 | 
			
		||||
	.id_table	= nct3018y_id,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -923,7 +923,7 @@ static struct i2c_driver pcf2127_i2c_driver = {
 | 
			
		|||
		.name	= "rtc-pcf2127-i2c",
 | 
			
		||||
		.of_match_table = of_match_ptr(pcf2127_of_match),
 | 
			
		||||
	},
 | 
			
		||||
	.probe_new	= pcf2127_i2c_probe,
 | 
			
		||||
	.probe		= pcf2127_i2c_probe,
 | 
			
		||||
	.id_table	= pcf2127_i2c_id,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -681,7 +681,7 @@ static struct i2c_driver pcf85063_driver = {
 | 
			
		|||
		.name	= "rtc-pcf85063",
 | 
			
		||||
		.of_match_table = of_match_ptr(pcf85063_of_match),
 | 
			
		||||
	},
 | 
			
		||||
	.probe_new	= pcf85063_probe,
 | 
			
		||||
	.probe		= pcf85063_probe,
 | 
			
		||||
	.id_table	= pcf85063_ids,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -488,7 +488,7 @@ static struct i2c_driver pcf8523_driver = {
 | 
			
		|||
		.name = "rtc-pcf8523",
 | 
			
		||||
		.of_match_table = pcf8523_of_match,
 | 
			
		||||
	},
 | 
			
		||||
	.probe_new = pcf8523_probe,
 | 
			
		||||
	.probe = pcf8523_probe,
 | 
			
		||||
	.id_table = pcf8523_id,
 | 
			
		||||
};
 | 
			
		||||
module_i2c_driver(pcf8523_driver);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -475,7 +475,7 @@ static struct i2c_driver pcf85363_driver = {
 | 
			
		|||
		.name	= "pcf85363",
 | 
			
		||||
		.of_match_table = of_match_ptr(dev_ids),
 | 
			
		||||
	},
 | 
			
		||||
	.probe_new = pcf85363_probe,
 | 
			
		||||
	.probe = pcf85363_probe,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
module_i2c_driver(pcf85363_driver);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -612,7 +612,7 @@ static struct i2c_driver pcf8563_driver = {
 | 
			
		|||
		.name	= "rtc-pcf8563",
 | 
			
		||||
		.of_match_table = of_match_ptr(pcf8563_of_match),
 | 
			
		||||
	},
 | 
			
		||||
	.probe_new	= pcf8563_probe,
 | 
			
		||||
	.probe		= pcf8563_probe,
 | 
			
		||||
	.id_table	= pcf8563_id,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -306,7 +306,7 @@ static struct i2c_driver pcf8583_driver = {
 | 
			
		|||
	.driver = {
 | 
			
		||||
		.name	= "pcf8583",
 | 
			
		||||
	},
 | 
			
		||||
	.probe_new	= pcf8583_probe,
 | 
			
		||||
	.probe		= pcf8583_probe,
 | 
			
		||||
	.id_table	= pcf8583_id,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -921,7 +921,7 @@ static struct i2c_driver rs5c372_driver = {
 | 
			
		|||
		.name	= "rtc-rs5c372",
 | 
			
		||||
		.of_match_table = of_match_ptr(rs5c372_of_match),
 | 
			
		||||
	},
 | 
			
		||||
	.probe_new	= rs5c372_probe,
 | 
			
		||||
	.probe		= rs5c372_probe,
 | 
			
		||||
	.remove		= rs5c372_remove,
 | 
			
		||||
	.id_table	= rs5c372_id,
 | 
			
		||||
};
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1000,7 +1000,7 @@ static struct i2c_driver rv3028_driver = {
 | 
			
		|||
		.acpi_match_table = rv3028_i2c_acpi_match,
 | 
			
		||||
		.of_match_table = of_match_ptr(rv3028_of_match),
 | 
			
		||||
	},
 | 
			
		||||
	.probe_new	= rv3028_probe,
 | 
			
		||||
	.probe		= rv3028_probe,
 | 
			
		||||
};
 | 
			
		||||
module_i2c_driver(rv3028_driver);
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -824,7 +824,7 @@ static struct i2c_driver rv3029_driver = {
 | 
			
		|||
		.name = "rv3029",
 | 
			
		||||
		.of_match_table = of_match_ptr(rv3029_of_match),
 | 
			
		||||
	},
 | 
			
		||||
	.probe_new	= rv3029_i2c_probe,
 | 
			
		||||
	.probe		= rv3029_i2c_probe,
 | 
			
		||||
	.id_table	= rv3029_id,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -998,7 +998,7 @@ static struct i2c_driver rv3032_driver = {
 | 
			
		|||
		.acpi_match_table = rv3032_i2c_acpi_match,
 | 
			
		||||
		.of_match_table = of_match_ptr(rv3032_of_match),
 | 
			
		||||
	},
 | 
			
		||||
	.probe_new	= rv3032_probe,
 | 
			
		||||
	.probe		= rv3032_probe,
 | 
			
		||||
};
 | 
			
		||||
module_i2c_driver(rv3032_driver);
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -739,7 +739,7 @@ static struct i2c_driver rv8803_driver = {
 | 
			
		|||
		.name = "rtc-rv8803",
 | 
			
		||||
		.of_match_table = of_match_ptr(rv8803_of_match),
 | 
			
		||||
	},
 | 
			
		||||
	.probe_new	= rv8803_probe,
 | 
			
		||||
	.probe		= rv8803_probe,
 | 
			
		||||
	.id_table	= rv8803_id,
 | 
			
		||||
};
 | 
			
		||||
module_i2c_driver(rv8803_driver);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -462,7 +462,7 @@ static struct i2c_driver rx6110_i2c_driver = {
 | 
			
		|||
		.name = RX6110_DRIVER_NAME,
 | 
			
		||||
		.acpi_match_table = rx6110_i2c_acpi_match,
 | 
			
		||||
	},
 | 
			
		||||
	.probe_new	= rx6110_i2c_probe,
 | 
			
		||||
	.probe		= rx6110_i2c_probe,
 | 
			
		||||
	.id_table	= rx6110_i2c_id,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -424,7 +424,7 @@ static struct i2c_driver rx8010_driver = {
 | 
			
		|||
		.name = "rtc-rx8010",
 | 
			
		||||
		.of_match_table = of_match_ptr(rx8010_of_match),
 | 
			
		||||
	},
 | 
			
		||||
	.probe_new	= rx8010_probe,
 | 
			
		||||
	.probe		= rx8010_probe,
 | 
			
		||||
	.id_table	= rx8010_id,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -581,7 +581,7 @@ static struct i2c_driver rx8025_driver = {
 | 
			
		|||
	.driver = {
 | 
			
		||||
		.name = "rtc-rx8025",
 | 
			
		||||
	},
 | 
			
		||||
	.probe_new	= rx8025_probe,
 | 
			
		||||
	.probe		= rx8025_probe,
 | 
			
		||||
	.id_table	= rx8025_id,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -325,7 +325,7 @@ static struct i2c_driver rx8581_driver = {
 | 
			
		|||
		.name	= "rtc-rx8581",
 | 
			
		||||
		.of_match_table = of_match_ptr(rx8581_of_match),
 | 
			
		||||
	},
 | 
			
		||||
	.probe_new	= rx8581_probe,
 | 
			
		||||
	.probe		= rx8581_probe,
 | 
			
		||||
	.id_table	= rx8581_id,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -499,7 +499,7 @@ static struct i2c_driver s35390a_driver = {
 | 
			
		|||
		.name	= "rtc-s35390a",
 | 
			
		||||
		.of_match_table = of_match_ptr(s35390a_of_match),
 | 
			
		||||
	},
 | 
			
		||||
	.probe_new	= s35390a_probe,
 | 
			
		||||
	.probe		= s35390a_probe,
 | 
			
		||||
	.id_table	= s35390a_id,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -217,7 +217,7 @@ static struct i2c_driver sd3078_driver = {
 | 
			
		|||
		.name   = "sd3078",
 | 
			
		||||
		.of_match_table = of_match_ptr(rtc_dt_match),
 | 
			
		||||
	},
 | 
			
		||||
	.probe_new  = sd3078_probe,
 | 
			
		||||
	.probe      = sd3078_probe,
 | 
			
		||||
	.id_table   = sd3078_id,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -679,7 +679,7 @@ static struct i2c_driver x1205_driver = {
 | 
			
		|||
		.name	= "rtc-x1205",
 | 
			
		||||
		.of_match_table = x1205_dt_ids,
 | 
			
		||||
	},
 | 
			
		||||
	.probe_new	= x1205_probe,
 | 
			
		||||
	.probe		= x1205_probe,
 | 
			
		||||
	.remove		= x1205_remove,
 | 
			
		||||
	.id_table	= x1205_id,
 | 
			
		||||
};
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue