net: ethernet: use platform_{get,set}_drvdata()
Use the wrapper functions for getting and setting the driver data using platform_device instead of using dev_{get,set}_drvdata() with &pdev->dev, so we can directly pass a struct platform_device. Also, unnecessary dev_set_drvdata() is removed, because the driver core clears the driver data to NULL after device_release or on probe failure. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
6d0bfe2261
commit
8513fbd880
@@ -3289,7 +3289,7 @@ static int ehea_probe_adapter(struct platform_device *dev,
|
||||
|
||||
adapter->pd = EHEA_PD_ID;
|
||||
|
||||
dev_set_drvdata(&dev->dev, adapter);
|
||||
platform_set_drvdata(dev, adapter);
|
||||
|
||||
|
||||
/* initialize adapter and ports */
|
||||
@@ -3360,7 +3360,7 @@ out:
|
||||
|
||||
static int ehea_remove(struct platform_device *dev)
|
||||
{
|
||||
struct ehea_adapter *adapter = dev_get_drvdata(&dev->dev);
|
||||
struct ehea_adapter *adapter = platform_get_drvdata(dev);
|
||||
int i;
|
||||
|
||||
for (i = 0; i < EHEA_MAX_PORTS; i++)
|
||||
|
@@ -696,7 +696,7 @@ static int mal_probe(struct platform_device *ofdev)
|
||||
|
||||
/* Advertise this instance to the rest of the world */
|
||||
wmb();
|
||||
dev_set_drvdata(&ofdev->dev, mal);
|
||||
platform_set_drvdata(ofdev, mal);
|
||||
|
||||
mal_dbg_register(mal);
|
||||
|
||||
@@ -722,7 +722,7 @@ static int mal_probe(struct platform_device *ofdev)
|
||||
|
||||
static int mal_remove(struct platform_device *ofdev)
|
||||
{
|
||||
struct mal_instance *mal = dev_get_drvdata(&ofdev->dev);
|
||||
struct mal_instance *mal = platform_get_drvdata(ofdev);
|
||||
|
||||
MAL_DBG(mal, "remove" NL);
|
||||
|
||||
@@ -735,8 +735,6 @@ static int mal_remove(struct platform_device *ofdev)
|
||||
"mal%d: commac list is not empty on remove!\n",
|
||||
mal->index);
|
||||
|
||||
dev_set_drvdata(&ofdev->dev, NULL);
|
||||
|
||||
free_irq(mal->serr_irq, mal);
|
||||
free_irq(mal->txde_irq, mal);
|
||||
free_irq(mal->txeob_irq, mal);
|
||||
|
@@ -95,7 +95,7 @@ static inline u32 rgmii_mode_mask(int mode, int input)
|
||||
|
||||
int rgmii_attach(struct platform_device *ofdev, int input, int mode)
|
||||
{
|
||||
struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
struct rgmii_instance *dev = platform_get_drvdata(ofdev);
|
||||
struct rgmii_regs __iomem *p = dev->base;
|
||||
|
||||
RGMII_DBG(dev, "attach(%d)" NL, input);
|
||||
@@ -124,7 +124,7 @@ int rgmii_attach(struct platform_device *ofdev, int input, int mode)
|
||||
|
||||
void rgmii_set_speed(struct platform_device *ofdev, int input, int speed)
|
||||
{
|
||||
struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
struct rgmii_instance *dev = platform_get_drvdata(ofdev);
|
||||
struct rgmii_regs __iomem *p = dev->base;
|
||||
u32 ssr;
|
||||
|
||||
@@ -146,7 +146,7 @@ void rgmii_set_speed(struct platform_device *ofdev, int input, int speed)
|
||||
|
||||
void rgmii_get_mdio(struct platform_device *ofdev, int input)
|
||||
{
|
||||
struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
struct rgmii_instance *dev = platform_get_drvdata(ofdev);
|
||||
struct rgmii_regs __iomem *p = dev->base;
|
||||
u32 fer;
|
||||
|
||||
@@ -167,7 +167,7 @@ void rgmii_get_mdio(struct platform_device *ofdev, int input)
|
||||
|
||||
void rgmii_put_mdio(struct platform_device *ofdev, int input)
|
||||
{
|
||||
struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
struct rgmii_instance *dev = platform_get_drvdata(ofdev);
|
||||
struct rgmii_regs __iomem *p = dev->base;
|
||||
u32 fer;
|
||||
|
||||
@@ -188,7 +188,7 @@ void rgmii_put_mdio(struct platform_device *ofdev, int input)
|
||||
|
||||
void rgmii_detach(struct platform_device *ofdev, int input)
|
||||
{
|
||||
struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
struct rgmii_instance *dev = platform_get_drvdata(ofdev);
|
||||
struct rgmii_regs __iomem *p;
|
||||
|
||||
BUG_ON(!dev || dev->users == 0);
|
||||
@@ -214,7 +214,7 @@ int rgmii_get_regs_len(struct platform_device *ofdev)
|
||||
|
||||
void *rgmii_dump_regs(struct platform_device *ofdev, void *buf)
|
||||
{
|
||||
struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
struct rgmii_instance *dev = platform_get_drvdata(ofdev);
|
||||
struct emac_ethtool_regs_subhdr *hdr = buf;
|
||||
struct rgmii_regs *regs = (struct rgmii_regs *)(hdr + 1);
|
||||
|
||||
@@ -279,7 +279,7 @@ static int rgmii_probe(struct platform_device *ofdev)
|
||||
(dev->flags & EMAC_RGMII_FLAG_HAS_MDIO) ? "" : "out");
|
||||
|
||||
wmb();
|
||||
dev_set_drvdata(&ofdev->dev, dev);
|
||||
platform_set_drvdata(ofdev, dev);
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -291,9 +291,7 @@ static int rgmii_probe(struct platform_device *ofdev)
|
||||
|
||||
static int rgmii_remove(struct platform_device *ofdev)
|
||||
{
|
||||
struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
|
||||
dev_set_drvdata(&ofdev->dev, NULL);
|
||||
struct rgmii_instance *dev = platform_get_drvdata(ofdev);
|
||||
|
||||
WARN_ON(dev->users != 0);
|
||||
|
||||
|
@@ -25,7 +25,7 @@
|
||||
|
||||
int tah_attach(struct platform_device *ofdev, int channel)
|
||||
{
|
||||
struct tah_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
struct tah_instance *dev = platform_get_drvdata(ofdev);
|
||||
|
||||
mutex_lock(&dev->lock);
|
||||
/* Reset has been done at probe() time... nothing else to do for now */
|
||||
@@ -37,7 +37,7 @@ int tah_attach(struct platform_device *ofdev, int channel)
|
||||
|
||||
void tah_detach(struct platform_device *ofdev, int channel)
|
||||
{
|
||||
struct tah_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
struct tah_instance *dev = platform_get_drvdata(ofdev);
|
||||
|
||||
mutex_lock(&dev->lock);
|
||||
--dev->users;
|
||||
@@ -46,7 +46,7 @@ void tah_detach(struct platform_device *ofdev, int channel)
|
||||
|
||||
void tah_reset(struct platform_device *ofdev)
|
||||
{
|
||||
struct tah_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
struct tah_instance *dev = platform_get_drvdata(ofdev);
|
||||
struct tah_regs __iomem *p = dev->base;
|
||||
int n;
|
||||
|
||||
@@ -74,7 +74,7 @@ int tah_get_regs_len(struct platform_device *ofdev)
|
||||
|
||||
void *tah_dump_regs(struct platform_device *ofdev, void *buf)
|
||||
{
|
||||
struct tah_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
struct tah_instance *dev = platform_get_drvdata(ofdev);
|
||||
struct emac_ethtool_regs_subhdr *hdr = buf;
|
||||
struct tah_regs *regs = (struct tah_regs *)(hdr + 1);
|
||||
|
||||
@@ -118,7 +118,7 @@ static int tah_probe(struct platform_device *ofdev)
|
||||
goto err_free;
|
||||
}
|
||||
|
||||
dev_set_drvdata(&ofdev->dev, dev);
|
||||
platform_set_drvdata(ofdev, dev);
|
||||
|
||||
/* Initialize TAH and enable IPv4 checksum verification, no TSO yet */
|
||||
tah_reset(ofdev);
|
||||
@@ -137,9 +137,7 @@ static int tah_probe(struct platform_device *ofdev)
|
||||
|
||||
static int tah_remove(struct platform_device *ofdev)
|
||||
{
|
||||
struct tah_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
|
||||
dev_set_drvdata(&ofdev->dev, NULL);
|
||||
struct tah_instance *dev = platform_get_drvdata(ofdev);
|
||||
|
||||
WARN_ON(dev->users != 0);
|
||||
|
||||
|
@@ -84,7 +84,7 @@ static inline u32 zmii_mode_mask(int mode, int input)
|
||||
|
||||
int zmii_attach(struct platform_device *ofdev, int input, int *mode)
|
||||
{
|
||||
struct zmii_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
struct zmii_instance *dev = platform_get_drvdata(ofdev);
|
||||
struct zmii_regs __iomem *p = dev->base;
|
||||
|
||||
ZMII_DBG(dev, "init(%d, %d)" NL, input, *mode);
|
||||
@@ -150,7 +150,7 @@ int zmii_attach(struct platform_device *ofdev, int input, int *mode)
|
||||
|
||||
void zmii_get_mdio(struct platform_device *ofdev, int input)
|
||||
{
|
||||
struct zmii_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
struct zmii_instance *dev = platform_get_drvdata(ofdev);
|
||||
u32 fer;
|
||||
|
||||
ZMII_DBG2(dev, "get_mdio(%d)" NL, input);
|
||||
@@ -163,7 +163,7 @@ void zmii_get_mdio(struct platform_device *ofdev, int input)
|
||||
|
||||
void zmii_put_mdio(struct platform_device *ofdev, int input)
|
||||
{
|
||||
struct zmii_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
struct zmii_instance *dev = platform_get_drvdata(ofdev);
|
||||
|
||||
ZMII_DBG2(dev, "put_mdio(%d)" NL, input);
|
||||
mutex_unlock(&dev->lock);
|
||||
@@ -172,7 +172,7 @@ void zmii_put_mdio(struct platform_device *ofdev, int input)
|
||||
|
||||
void zmii_set_speed(struct platform_device *ofdev, int input, int speed)
|
||||
{
|
||||
struct zmii_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
struct zmii_instance *dev = platform_get_drvdata(ofdev);
|
||||
u32 ssr;
|
||||
|
||||
mutex_lock(&dev->lock);
|
||||
@@ -193,7 +193,7 @@ void zmii_set_speed(struct platform_device *ofdev, int input, int speed)
|
||||
|
||||
void zmii_detach(struct platform_device *ofdev, int input)
|
||||
{
|
||||
struct zmii_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
struct zmii_instance *dev = platform_get_drvdata(ofdev);
|
||||
|
||||
BUG_ON(!dev || dev->users == 0);
|
||||
|
||||
@@ -218,7 +218,7 @@ int zmii_get_regs_len(struct platform_device *ofdev)
|
||||
|
||||
void *zmii_dump_regs(struct platform_device *ofdev, void *buf)
|
||||
{
|
||||
struct zmii_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
struct zmii_instance *dev = platform_get_drvdata(ofdev);
|
||||
struct emac_ethtool_regs_subhdr *hdr = buf;
|
||||
struct zmii_regs *regs = (struct zmii_regs *)(hdr + 1);
|
||||
|
||||
@@ -272,7 +272,7 @@ static int zmii_probe(struct platform_device *ofdev)
|
||||
printk(KERN_INFO
|
||||
"ZMII %s initialized\n", ofdev->dev.of_node->full_name);
|
||||
wmb();
|
||||
dev_set_drvdata(&ofdev->dev, dev);
|
||||
platform_set_drvdata(ofdev, dev);
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -284,9 +284,7 @@ static int zmii_probe(struct platform_device *ofdev)
|
||||
|
||||
static int zmii_remove(struct platform_device *ofdev)
|
||||
{
|
||||
struct zmii_instance *dev = dev_get_drvdata(&ofdev->dev);
|
||||
|
||||
dev_set_drvdata(&ofdev->dev, NULL);
|
||||
struct zmii_instance *dev = platform_get_drvdata(ofdev);
|
||||
|
||||
WARN_ON(dev->users != 0);
|
||||
|
||||
|
Reference in New Issue
Block a user