Skip to content

Commit e2e6a23

Browse files
frankcrawfordgroeck
authored andcommitted
hwmon: (it87) Do not enter configuration mode for some chiptypes
Update the configuration mode entry code to allow conditional entry, and apply to all calls. Signed-off-by: Frank Crawford <frank@crawford.emu.id.au> Link: https://lore.kernel.org/r/20240428060653.2425296-3-frank@crawford.emu.id.au Signed-off-by: Guenter Roeck <linux@roeck-us.net>
1 parent f4f3e5d commit e2e6a23

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

drivers/hwmon/it87.c

+7-6
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,16 @@ static inline void superio_select(int ioreg, int ldn)
117117
outb(ldn, ioreg + 1);
118118
}
119119

120-
static inline int superio_enter(int ioreg)
120+
static inline int superio_enter(int ioreg, bool noentry)
121121
{
122122
/*
123123
* Try to reserve ioreg and ioreg + 1 for exclusive access.
124124
*/
125125
if (!request_muxed_region(ioreg, 2, DRVNAME))
126126
return -EBUSY;
127127

128-
__superio_enter(ioreg);
128+
if (!noentry)
129+
__superio_enter(ioreg);
129130
return 0;
130131
}
131132

@@ -742,7 +743,7 @@ static int smbus_disable(struct it87_data *data)
742743
int err;
743744

744745
if (data->smbus_bitmap) {
745-
err = superio_enter(data->sioaddr);
746+
err = superio_enter(data->sioaddr, has_noconf(data));
746747
if (err)
747748
return err;
748749
superio_select(data->sioaddr, PME);
@@ -758,7 +759,7 @@ static int smbus_enable(struct it87_data *data)
758759
int err;
759760

760761
if (data->smbus_bitmap) {
761-
err = superio_enter(data->sioaddr);
762+
err = superio_enter(data->sioaddr, has_noconf(data));
762763
if (err)
763764
return err;
764765

@@ -2674,7 +2675,7 @@ static int __init it87_find(int sioaddr, unsigned short *address,
26742675
u16 chip_type;
26752676
const struct it87_devices *config = NULL;
26762677

2677-
err = superio_enter(sioaddr);
2678+
err = superio_enter(sioaddr, false);
26782679
if (err)
26792680
return err;
26802681

@@ -3520,7 +3521,7 @@ static void it87_resume_sio(struct platform_device *pdev)
35203521
if (!data->need_in7_reroute)
35213522
return;
35223523

3523-
err = superio_enter(data->sioaddr);
3524+
err = superio_enter(data->sioaddr, has_noconf(data));
35243525
if (err) {
35253526
dev_warn(&pdev->dev,
35263527
"Unable to enter Super I/O to reroute in7 (%d)",

0 commit comments

Comments
 (0)