Skip to content

Commit fdf1960

Browse files
committed
grub-core/loader/slaunch/psp.c: drop extra assignments from init_drtm_device()
Signed-off-by: Sergii Dmytruk <[email protected]>
1 parent a714967 commit fdf1960

File tree

1 file changed

+2
-9
lines changed
  • grub-core/loader/slaunch

1 file changed

+2
-9
lines changed

grub-core/loader/slaunch/psp.c

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -224,19 +224,15 @@ init_drtm_device (grub_pci_device_t dev)
224224
grub_pci_address_t pci_cmd_addr, pin_addr, lat_addr;
225225

226226
/* Enable memory space access for PSP */
227-
pci_cmd = 0;
228227
pci_cmd_addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);
229-
pci_cmd = grub_pci_read_word (pci_cmd_addr);
230-
pci_cmd |= 0x2;
228+
pci_cmd = grub_pci_read_word (pci_cmd_addr) | 0x2;
231229
grub_pci_write_word (pci_cmd_addr, pci_cmd);
232230

233231
/* Enable PCI interrupts */
234-
pin = 0;
235232
pin_addr = grub_pci_make_address (dev, GRUB_PCI_REG_IRQ_PIN);
236233
pin = grub_pci_read_byte (pin_addr);
237234
if (pin)
238235
{
239-
pci_cmd = 0;
240236
pci_cmd = grub_pci_read_word (pci_cmd_addr);
241237
if (pci_cmd & 0x400)
242238
{
@@ -246,13 +242,10 @@ init_drtm_device (grub_pci_device_t dev)
246242
}
247243

248244
/* Set PSP at bus master */
249-
pci_cmd = 0;
250-
pci_cmd = grub_pci_read_word (pci_cmd_addr);
251-
pci_cmd |= 0x4;
245+
pci_cmd = grub_pci_read_word (pci_cmd_addr) | 0x4;
252246
grub_pci_write_word (pci_cmd_addr, pci_cmd);
253247

254248
/* Set PCI latency timer */
255-
lat = 0;
256249
lat_addr = grub_pci_make_address (dev, GRUB_PCI_REG_LAT_TIMER);
257250
lat = grub_pci_read_byte (lat_addr);
258251
if (lat < 16)

0 commit comments

Comments
 (0)