tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
net: phy: realtek: use new PHYID matching macros
Use new macros for PHYID matching to avoid boilerplate code.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
authored by
Heiner Kallweit
and committed by
David S. Miller
ca494936
aa2af2eb
+10
-19
+10
-19
drivers/net/phy/realtek.c
+10
-19
drivers/net/phy/realtek.c
···
213
213
214
214
static struct phy_driver realtek_drvs[] = {
215
215
{
216
-
.phy_id = 0x00008201,
216
+
PHY_ID_MATCH_EXACT(0x00008201),
217
217
.name = "RTL8201CP Ethernet",
218
-
.phy_id_mask = 0x0000ffff,
219
218
.features = PHY_BASIC_FEATURES,
220
219
}, {
221
-
.phy_id = 0x001cc816,
220
+
PHY_ID_MATCH_EXACT(0x001cc816),
222
221
.name = "RTL8201F Fast Ethernet",
223
-
.phy_id_mask = 0x001fffff,
224
222
.features = PHY_BASIC_FEATURES,
225
223
.ack_interrupt = &rtl8201_ack_interrupt,
226
224
.config_intr = &rtl8201_config_intr,
···
227
229
.read_page = rtl821x_read_page,
228
230
.write_page = rtl821x_write_page,
229
231
}, {
230
-
.phy_id = 0x001cc910,
232
+
PHY_ID_MATCH_EXACT(0x001cc910),
231
233
.name = "RTL8211 Gigabit Ethernet",
232
-
.phy_id_mask = 0x001fffff,
233
234
.features = PHY_GBIT_FEATURES,
234
235
.config_aneg = rtl8211_config_aneg,
235
236
.read_mmd = &genphy_read_mmd_unsupported,
236
237
.write_mmd = &genphy_write_mmd_unsupported,
237
238
}, {
238
-
.phy_id = 0x001cc912,
239
+
PHY_ID_MATCH_EXACT(0x001cc912),
239
240
.name = "RTL8211B Gigabit Ethernet",
240
-
.phy_id_mask = 0x001fffff,
241
241
.features = PHY_GBIT_FEATURES,
242
242
.ack_interrupt = &rtl821x_ack_interrupt,
243
243
.config_intr = &rtl8211b_config_intr,
···
244
248
.suspend = rtl8211b_suspend,
245
249
.resume = rtl8211b_resume,
246
250
}, {
247
-
.phy_id = 0x001cc913,
251
+
PHY_ID_MATCH_EXACT(0x001cc913),
248
252
.name = "RTL8211C Gigabit Ethernet",
249
-
.phy_id_mask = 0x001fffff,
250
253
.features = PHY_GBIT_FEATURES,
251
254
.config_init = rtl8211c_config_init,
252
255
.read_mmd = &genphy_read_mmd_unsupported,
253
256
.write_mmd = &genphy_write_mmd_unsupported,
254
257
}, {
255
-
.phy_id = 0x001cc914,
258
+
PHY_ID_MATCH_EXACT(0x001cc914),
256
259
.name = "RTL8211DN Gigabit Ethernet",
257
-
.phy_id_mask = 0x001fffff,
258
260
.features = PHY_GBIT_FEATURES,
259
261
.ack_interrupt = rtl821x_ack_interrupt,
260
262
.config_intr = rtl8211e_config_intr,
261
263
.suspend = genphy_suspend,
262
264
.resume = genphy_resume,
263
265
}, {
264
-
.phy_id = 0x001cc915,
266
+
PHY_ID_MATCH_EXACT(0x001cc915),
265
267
.name = "RTL8211E Gigabit Ethernet",
266
-
.phy_id_mask = 0x001fffff,
267
268
.features = PHY_GBIT_FEATURES,
268
269
.ack_interrupt = &rtl821x_ack_interrupt,
269
270
.config_intr = &rtl8211e_config_intr,
270
271
.suspend = genphy_suspend,
271
272
.resume = genphy_resume,
272
273
}, {
273
-
.phy_id = 0x001cc916,
274
+
PHY_ID_MATCH_EXACT(0x001cc916),
274
275
.name = "RTL8211F Gigabit Ethernet",
275
-
.phy_id_mask = 0x001fffff,
276
276
.features = PHY_GBIT_FEATURES,
277
277
.config_init = &rtl8211f_config_init,
278
278
.ack_interrupt = &rtl8211f_ack_interrupt,
···
278
286
.read_page = rtl821x_read_page,
279
287
.write_page = rtl821x_write_page,
280
288
}, {
281
-
.phy_id = 0x001cc961,
289
+
PHY_ID_MATCH_EXACT(0x001cc961),
282
290
.name = "RTL8366RB Gigabit Ethernet",
283
-
.phy_id_mask = 0x001fffff,
284
291
.features = PHY_GBIT_FEATURES,
285
292
.config_init = &rtl8366rb_config_init,
286
293
.suspend = genphy_suspend,
···
290
299
module_phy_driver(realtek_drvs);
291
300
292
301
static const struct mdio_device_id __maybe_unused realtek_tbl[] = {
293
-
{ 0x001cc800, GENMASK(31, 10) },
302
+
{ PHY_ID_MATCH_VENDOR(0x001cc800) },
294
303
{ }
295
304
};
296
305