Skip to content

Commit b37fe4a

Browse files
committed
[DM/FIXUP] Fixup NVME build
1. Fixup Kconfig show order. 2. Fix `RT_DECLARE_IRQ_AFFINITY` to `RT_IRQ_AFFINITY_DECLARE` Signed-off-by: GuEe-GUI <[email protected]>
1 parent 359b7af commit b37fe4a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

components/drivers/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ rsource "led/Kconfig"
2525
rsource "mailbox/Kconfig"
2626
rsource "phye/Kconfig"
2727
rsource "ata/Kconfig"
28-
rsource "block/Kconfig"
2928
rsource "nvme/Kconfig"
29+
rsource "block/Kconfig"
3030
rsource "scsi/Kconfig"
3131
rsource "regulator/Kconfig"
3232
rsource "reset/Kconfig"

components/drivers/nvme/nvme.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -955,7 +955,7 @@ static rt_err_t nvme_setup_io_queues(struct rt_nvme_controller *nvme)
955955
int irq, cpuid = 0;
956956
char name[RT_NAME_MAX];
957957
rt_bool_t affinity_fixup = RT_FALSE;
958-
RT_DECLARE_IRQ_AFFINITY(affinity) = { 0 };
958+
RT_IRQ_AFFINITY_DECLARE(affinity) = { 0 };
959959
struct rt_nvme_queue *queue;
960960

961961
nvme->io_queue_max = nvme->irqs_nr > 1 ? nvme->irqs_nr - 1 : 1;
@@ -1272,8 +1272,8 @@ static int nvme_queue_affinify_fixup(void)
12721272
{
12731273
int cpuid = rt_hw_cpu_id();
12741274
struct rt_nvme_controller *nvme;
1275-
RT_DECLARE_IRQ_AFFINITY(affinity) = { 0 };
1276-
RT_DECLARE_IRQ_AFFINITY(current_affinity) = { 0 };
1275+
RT_IRQ_AFFINITY_DECLARE(affinity) = { 0 };
1276+
RT_IRQ_AFFINITY_DECLARE(current_affinity) = { 0 };
12771277

12781278
RT_IRQ_AFFINITY_SET(affinity, cpuid);
12791279

0 commit comments

Comments
 (0)