Commit b72490a5 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman
Browse files

Staging: rtl8187se: cleanup r8180_pm.c 



* remove unused rtl8180_{save_state,enable_wake}()
* remove commented out code
* beautify code

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 44a7dcbc

drivers/staging/rtl8187se/r8180_pm.c

+8 −24
Original line number Diff line number Diff line
@@ -15,16 +15,9 @@ 
#include "r8180_pm.h"

#include "r8180.h"



int rtl8180_save_state (struct pci_dev *dev, u32 state)

{

        printk(KERN_NOTICE "r8180 save state call (state %u).\n", state);

	return(-EAGAIN);

}



int rtl8180_suspend(struct pci_dev *pdev, pm_message_t state)

{

	struct net_device *dev = pci_get_drvdata(pdev);

//	struct r8180_priv *priv = ieee80211_priv(dev);



	if (!netif_running(dev))

		goto out_pci_suspend;
@@ -44,7 +37,6 @@ int rtl8180_suspend (struct pci_dev *pdev, pm_message_t state) 
int rtl8180_resume(struct pci_dev *pdev)

{

	struct net_device *dev = pci_get_drvdata(pdev);

//	struct r8180_priv *priv = ieee80211_priv(dev);

	int err;

	u32 val;
@@ -57,7 +49,9 @@ int rtl8180_resume (struct pci_dev *pdev) 


		return err;

	}



	pci_restore_state(pdev);



	/*

	 * Suspend/Resume resets the PCI configuration space, so we have to

	 * re-disable the RETRY_TIMEOUT register (0x41) to keep PCI Tx retries
@@ -73,18 +67,8 @@ int rtl8180_resume (struct pci_dev *pdev) 


	if (dev->netdev_ops->ndo_open)

		dev->netdev_ops->ndo_open(dev);



	netif_device_attach(dev);

out:

	return 0;

}
 




int rtl8180_enable_wake (struct pci_dev *dev, u32 state, int enable)

{

        printk(KERN_NOTICE "r8180 enable wake call (state %u, enable %d).\n",

	       state, enable);

	return(-EAGAIN);

}

drivers/staging/rtl8187se/r8180_pm.h

+0 −2
Original line number Diff line number Diff line
@@ -17,10 +17,8 @@ 
#include <linux/types.h>

#include <linux/pci.h>



int rtl8180_save_state (struct pci_dev *dev, u32 state);

int rtl8180_suspend (struct pci_dev *pdev, pm_message_t state);

int rtl8180_resume (struct pci_dev *pdev);

int rtl8180_enable_wake (struct pci_dev *dev, u32 state, int enable);



#endif //R8180_PM_H