summaryrefslogtreecommitdiff
path: root/drivers/net/phy
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/phy')
-rw-r--r--drivers/net/phy/as21xxx.c2
-rw-r--r--drivers/net/phy/dp83640.c4
-rw-r--r--drivers/net/phy/mdio_device.c2
-rw-r--r--drivers/net/phy/micrel.c2
-rw-r--r--drivers/net/phy/microchip_rds_ptp.c2
-rw-r--r--drivers/net/phy/mii_timestamper.c2
-rw-r--r--drivers/net/phy/mscc/mscc_macsec.c2
-rw-r--r--drivers/net/phy/nxp-c45-tja11xx-macsec.c4
-rw-r--r--drivers/net/phy/phy.c2
-rw-r--r--drivers/net/phy/phy_device.c4
-rw-r--r--drivers/net/phy/phy_led_triggers.c2
-rw-r--r--drivers/net/phy/phy_link_topology.c4
-rw-r--r--drivers/net/phy/phy_package.c2
-rw-r--r--drivers/net/phy/phy_port.c2
-rw-r--r--drivers/net/phy/phylink.c2
-rw-r--r--drivers/net/phy/sfp-bus.c2
-rw-r--r--drivers/net/phy/sfp.c2
17 files changed, 21 insertions, 21 deletions
diff --git a/drivers/net/phy/as21xxx.c b/drivers/net/phy/as21xxx.c
index d3954ea6b1dd..d5738117eca6 100644
--- a/drivers/net/phy/as21xxx.c
+++ b/drivers/net/phy/as21xxx.c
@@ -907,7 +907,7 @@ static int as21xxx_match_phy_device(struct phy_device *phydev,
return phy_id == phydrv->phy_id;
/* Allocate temp priv and load the firmware */
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c
index a56f4302840f..be0051ff6420 100644
--- a/drivers/net/phy/dp83640.c
+++ b/drivers/net/phy/dp83640.c
@@ -1027,7 +1027,7 @@ static struct dp83640_clock *dp83640_clock_get_bus(struct mii_bus *bus)
if (clock)
goto out;
- clock = kzalloc_obj(struct dp83640_clock, GFP_KERNEL);
+ clock = kzalloc_obj(struct dp83640_clock);
if (!clock)
goto out;
@@ -1411,7 +1411,7 @@ static int dp83640_probe(struct phy_device *phydev)
if (!clock)
goto no_clock;
- dp83640 = kzalloc_obj(struct dp83640_private, GFP_KERNEL);
+ dp83640 = kzalloc_obj(struct dp83640_private);
if (!dp83640)
goto no_memory;
diff --git a/drivers/net/phy/mdio_device.c b/drivers/net/phy/mdio_device.c
index 172fbfcb215c..b8a5a1838196 100644
--- a/drivers/net/phy/mdio_device.c
+++ b/drivers/net/phy/mdio_device.c
@@ -41,7 +41,7 @@ struct mdio_device *mdio_device_create(struct mii_bus *bus, int addr)
struct mdio_device *mdiodev;
/* We allocate the device, and initialize the default values */
- mdiodev = kzalloc_obj(*mdiodev, GFP_KERNEL);
+ mdiodev = kzalloc_obj(*mdiodev);
if (!mdiodev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index 5ef9248c6b49..c6b011a9d636 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -4114,7 +4114,7 @@ static void lan8814_get_rx_ts(struct kszphy_ptp_priv *ptp_priv)
u32 reg;
do {
- rx_ts = kzalloc_obj(*rx_ts, GFP_KERNEL);
+ rx_ts = kzalloc_obj(*rx_ts);
if (!rx_ts)
return;
diff --git a/drivers/net/phy/microchip_rds_ptp.c b/drivers/net/phy/microchip_rds_ptp.c
index 9307df6f6d11..2ad95d5c9d86 100644
--- a/drivers/net/phy/microchip_rds_ptp.c
+++ b/drivers/net/phy/microchip_rds_ptp.c
@@ -999,7 +999,7 @@ static struct mchp_rds_ptp_rx_ts
if (rc < 0)
goto error;
- rx_ts = kmalloc_obj(*rx_ts, GFP_KERNEL);
+ rx_ts = kmalloc_obj(*rx_ts);
if (!rx_ts)
return NULL;
diff --git a/drivers/net/phy/mii_timestamper.c b/drivers/net/phy/mii_timestamper.c
index 259ed30897c7..3ad10e9e36d0 100644
--- a/drivers/net/phy/mii_timestamper.c
+++ b/drivers/net/phy/mii_timestamper.c
@@ -28,7 +28,7 @@ int register_mii_tstamp_controller(struct device *device,
{
struct mii_timestamping_desc *desc;
- desc = kzalloc_obj(*desc, GFP_KERNEL);
+ desc = kzalloc_obj(*desc);
if (!desc)
return -ENOMEM;
diff --git a/drivers/net/phy/mscc/mscc_macsec.c b/drivers/net/phy/mscc/mscc_macsec.c
index ed0d445ce1e1..2ae5eed6da1a 100644
--- a/drivers/net/phy/mscc/mscc_macsec.c
+++ b/drivers/net/phy/mscc/mscc_macsec.c
@@ -610,7 +610,7 @@ static struct macsec_flow *vsc8584_macsec_alloc_flow(struct vsc8531_private *pri
if (index == MSCC_MS_MAX_FLOWS)
return ERR_PTR(-ENOMEM);
- flow = kzalloc_obj(*flow, GFP_KERNEL);
+ flow = kzalloc_obj(*flow);
if (!flow)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/phy/nxp-c45-tja11xx-macsec.c b/drivers/net/phy/nxp-c45-tja11xx-macsec.c
index 21519a2d9f85..63e3934be653 100644
--- a/drivers/net/phy/nxp-c45-tja11xx-macsec.c
+++ b/drivers/net/phy/nxp-c45-tja11xx-macsec.c
@@ -431,7 +431,7 @@ static struct nxp_c45_sa *nxp_c45_sa_alloc(struct list_head *sa_list, void *sa,
return ERR_PTR(-ENOSPC);
}
- tmp = kzalloc_obj(*tmp, GFP_KERNEL);
+ tmp = kzalloc_obj(*tmp);
if (!tmp)
return ERR_PTR(-ENOMEM);
@@ -991,7 +991,7 @@ static int nxp_c45_mdo_add_secy(struct macsec_context *ctx)
if (idx == TX_SC_MAX)
return -ENOSPC;
- phy_secy = kzalloc_obj(*phy_secy, GFP_KERNEL);
+ phy_secy = kzalloc_obj(*phy_secy);
if (!phy_secy)
return -ENOMEM;
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 376bfa923349..1f1039084f51 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -736,7 +736,7 @@ int phy_ethtool_set_plca_cfg(struct phy_device *phydev,
goto out;
}
- curr_plca_cfg = kmalloc_obj(*curr_plca_cfg, GFP_KERNEL);
+ curr_plca_cfg = kmalloc_obj(*curr_plca_cfg);
if (!curr_plca_cfg) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 52c2ff7fc6ae..02fc0133428d 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -438,7 +438,7 @@ static SIMPLE_DEV_PM_OPS(mdio_bus_phy_pm_ops, mdio_bus_phy_suspend,
static int phy_register_fixup(const char *bus_id, u32 phy_uid, u32 phy_uid_mask,
int (*run)(struct phy_device *))
{
- struct phy_fixup *fixup = kzalloc_obj(*fixup, GFP_KERNEL);
+ struct phy_fixup *fixup = kzalloc_obj(*fixup);
if (!fixup)
return -ENOMEM;
@@ -754,7 +754,7 @@ struct phy_device *phy_device_create(struct mii_bus *bus, int addr, u32 phy_id,
int ret = 0;
/* We allocate the device, and initialize the default values */
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/phy/phy_led_triggers.c b/drivers/net/phy/phy_led_triggers.c
index 7821fe19934c..9e24d4ebcb79 100644
--- a/drivers/net/phy/phy_led_triggers.c
+++ b/drivers/net/phy/phy_led_triggers.c
@@ -93,7 +93,7 @@ int phy_led_triggers_register(struct phy_device *phy)
if (!phy->phy_num_led_triggers)
return 0;
- phy->led_link_trigger = kzalloc_obj(*phy->led_link_trigger, GFP_KERNEL);
+ phy->led_link_trigger = kzalloc_obj(*phy->led_link_trigger);
if (!phy->led_link_trigger) {
err = -ENOMEM;
goto out_clear;
diff --git a/drivers/net/phy/phy_link_topology.c b/drivers/net/phy/phy_link_topology.c
index ed15599dd38d..1f1eb5d59b38 100644
--- a/drivers/net/phy/phy_link_topology.c
+++ b/drivers/net/phy/phy_link_topology.c
@@ -15,7 +15,7 @@ static int netdev_alloc_phy_link_topology(struct net_device *dev)
{
struct phy_link_topology *topo;
- topo = kzalloc_obj(*topo, GFP_KERNEL);
+ topo = kzalloc_obj(*topo);
if (!topo)
return -ENOMEM;
@@ -43,7 +43,7 @@ int phy_link_topo_add_phy(struct net_device *dev,
topo = dev->link_topo;
}
- pdn = kzalloc_obj(*pdn, GFP_KERNEL);
+ pdn = kzalloc_obj(*pdn);
if (!pdn)
return -ENOMEM;
diff --git a/drivers/net/phy/phy_package.c b/drivers/net/phy/phy_package.c
index 3137a8fecf21..63e4f862f731 100644
--- a/drivers/net/phy/phy_package.c
+++ b/drivers/net/phy/phy_package.c
@@ -219,7 +219,7 @@ int phy_package_join(struct phy_device *phydev, int base_addr, size_t priv_size)
shared = bus->shared[base_addr];
if (!shared) {
ret = -ENOMEM;
- shared = kzalloc_obj(*shared, GFP_KERNEL);
+ shared = kzalloc_obj(*shared);
if (!shared)
goto err_unlock;
if (priv_size) {
diff --git a/drivers/net/phy/phy_port.c b/drivers/net/phy/phy_port.c
index cae133a25fb0..e56e29d0e9fa 100644
--- a/drivers/net/phy/phy_port.c
+++ b/drivers/net/phy/phy_port.c
@@ -19,7 +19,7 @@ struct phy_port *phy_port_alloc(void)
{
struct phy_port *port;
- port = kzalloc_obj(*port, GFP_KERNEL);
+ port = kzalloc_obj(*port);
if (!port)
return NULL;
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index f21a69e34d1c..aba1b35c7cd7 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -1853,7 +1853,7 @@ struct phylink *phylink_create(struct phylink_config *config,
return ERR_PTR(-EINVAL);
}
- pl = kzalloc_obj(*pl, GFP_KERNEL);
+ pl = kzalloc_obj(*pl);
if (!pl)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/phy/sfp-bus.c b/drivers/net/phy/sfp-bus.c
index 07175bf3ef60..8679d27bf1ba 100644
--- a/drivers/net/phy/sfp-bus.c
+++ b/drivers/net/phy/sfp-bus.c
@@ -388,7 +388,7 @@ static struct sfp_bus *sfp_bus_get(const struct fwnode_handle *fwnode)
{
struct sfp_bus *sfp, *new, *found = NULL;
- new = kzalloc_obj(*new, GFP_KERNEL);
+ new = kzalloc_obj(*new);
mutex_lock(&sfp_mutex);
diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
index 42a9c93f03b3..f4bf53da3d4f 100644
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
@@ -3029,7 +3029,7 @@ static struct sfp *sfp_alloc(struct device *dev)
{
struct sfp *sfp;
- sfp = kzalloc_obj(*sfp, GFP_KERNEL);
+ sfp = kzalloc_obj(*sfp);
if (!sfp)
return ERR_PTR(-ENOMEM);