diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2023-10-04 18:06:27 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2023-10-04 18:06:27 +0300 |
| commit | 7824a88b4286980512de2a46763646100274a5ac (patch) | |
| tree | fc10f5509fa12f85b72ba14c9bdf62641278f303 /drivers/ata/pata_parport/comm.c | |
| parent | 25591b66d0a4f9277241cebe1a74b4f985bc27a9 (diff) | |
| parent | caacbdc28f545744770fb2caf347b3c4be9a6299 (diff) | |
Merge drm/drm-next into drm-intel-next
Backmerge to sync up with drm-intel-gt-next and drm-misc-next.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/ata/pata_parport/comm.c')
| -rw-r--r-- | drivers/ata/pata_parport/comm.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/ata/pata_parport/comm.c b/drivers/ata/pata_parport/comm.c index 4839becbbd56..94b8d352102e 100644 --- a/drivers/ata/pata_parport/comm.c +++ b/drivers/ata/pata_parport/comm.c @@ -37,7 +37,7 @@ static int comm_read_regr(struct pi_adapter *pi, int cont, int regr) { int l, h, r; - r = regr + cont_map[cont]; + r = regr + cont_map[cont]; switch (pi->mode) { case 0: @@ -90,7 +90,6 @@ static void comm_connect(struct pi_adapter *pi) } static void comm_disconnect(struct pi_adapter *pi) - { w2(0); w2(0); w2(0); w2(4); w0(pi->saved_r0); @@ -172,12 +171,12 @@ static void comm_write_block(struct pi_adapter *pi, char *buf, int count) w4l(swab16(((u16 *)buf)[2 * k]) | swab16(((u16 *)buf)[2 * k + 1]) << 16); break; - } + } } static void comm_log_adapter(struct pi_adapter *pi) - -{ char *mode_string[5] = { "4-bit", "8-bit", "EPP-8", "EPP-16", "EPP-32" }; +{ + char *mode_string[5] = { "4-bit", "8-bit", "EPP-8", "EPP-16", "EPP-32" }; dev_info(&pi->dev, "DataStor Commuter at 0x%x, mode %d (%s), delay %d\n", |