|
@@ -44,10 +44,8 @@
|
|
|
#include <linux/prefetch.h>
|
|
|
#include <linux/dma-mapping.h>
|
|
|
#include <linux/firmware.h>
|
|
|
-#if IS_ENABLED(CONFIG_HWMON)
|
|
|
#include <linux/hwmon.h>
|
|
|
#include <linux/hwmon-sysfs.h>
|
|
|
-#endif
|
|
|
|
|
|
#include <net/checksum.h>
|
|
|
#include <net/ip.h>
|
|
@@ -9594,7 +9592,6 @@ static int tg3_init_hw(struct tg3 *tp, int reset_phy)
|
|
|
return tg3_reset_hw(tp, reset_phy);
|
|
|
}
|
|
|
|
|
|
-#if IS_ENABLED(CONFIG_HWMON)
|
|
|
static void tg3_sd_scan_scratchpad(struct tg3 *tp, struct tg3_ocir *ocir)
|
|
|
{
|
|
|
int i;
|
|
@@ -9647,22 +9644,17 @@ static const struct attribute_group tg3_group = {
|
|
|
.attrs = tg3_attributes,
|
|
|
};
|
|
|
|
|
|
-#endif
|
|
|
-
|
|
|
static void tg3_hwmon_close(struct tg3 *tp)
|
|
|
{
|
|
|
-#if IS_ENABLED(CONFIG_HWMON)
|
|
|
if (tp->hwmon_dev) {
|
|
|
hwmon_device_unregister(tp->hwmon_dev);
|
|
|
tp->hwmon_dev = NULL;
|
|
|
sysfs_remove_group(&tp->pdev->dev.kobj, &tg3_group);
|
|
|
}
|
|
|
-#endif
|
|
|
}
|
|
|
|
|
|
static void tg3_hwmon_open(struct tg3 *tp)
|
|
|
{
|
|
|
-#if IS_ENABLED(CONFIG_HWMON)
|
|
|
int i, err;
|
|
|
u32 size = 0;
|
|
|
struct pci_dev *pdev = tp->pdev;
|
|
@@ -9694,7 +9686,6 @@ static void tg3_hwmon_open(struct tg3 *tp)
|
|
|
dev_err(&pdev->dev, "Cannot register hwmon device, aborting\n");
|
|
|
sysfs_remove_group(&pdev->dev.kobj, &tg3_group);
|
|
|
}
|
|
|
-#endif
|
|
|
}
|
|
|
|
|
|
|