scsi: zorro7xx: Use individual zorro_driver_data structures

Using an array of zorro_driver_data objects and referring to its
elements by index obfuscates the code and is error-prone.

Improve readability and reduce code size by replacing the array (which
includes an unneeded sentinel) by individual zorro_driver_data objects.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Link: https://patch.msgid.link/7deafe83754415c5beb280f3c1808e153029e890.1788169600.git.geert@linux-m68k.org
Signed-off-by: Martin K. Petersen (Oracle) <mkp@kernel.org>
This commit is contained in:
Geert Uytterhoeven 2026-08-31 11:49:20 +02:00 committed by Martin K. Petersen (Oracle)
parent e83b47309f
commit 6b0f8a689e

View File

@ -35,38 +35,45 @@ static struct scsi_host_template zorro7xx_scsi_driver_template = {
.module = THIS_MODULE,
};
static struct zorro_driver_data {
struct zorro_driver_data {
const char *name;
unsigned long offset;
int absolute; /* offset is absolute address */
} zorro7xx_driver_data[] = {
{ .name = "PowerUP 603e+", .offset = 0xf40000, .absolute = 1 },
{ .name = "WarpEngine 40xx", .offset = 0x40000 },
{ .name = "A4091", .offset = 0x800000 },
{ .name = "GForce 040/060", .offset = 0x40000 },
{ 0 }
};
static const struct zorro_driver_data zorro7xx_blizzard_603e_plus_data = {
.name = "PowerUP 603e+", .offset = 0xf40000, .absolute = 1
};
static const struct zorro_driver_data zorro7xx_warp_engine_40xx_data = {
.name = "WarpEngine 40xx", .offset = 0x40000
};
static const struct zorro_driver_data zorro7xx_a4091_data = {
.name = "A4091", .offset = 0x800000
};
static const struct zorro_driver_data zorro7xx_gforce_040_060_data = {
.name = "GForce 040/060", .offset = 0x40000
};
static struct zorro_device_id zorro7xx_zorro_tbl[] = {
{
.id = ZORRO_PROD_PHASE5_BLIZZARD_603E_PLUS,
.driver_data_ptr = &zorro7xx_driver_data[0],
.driver_data_ptr = &zorro7xx_blizzard_603e_plus_data,
},
{
.id = ZORRO_PROD_MACROSYSTEMS_WARP_ENGINE_40xx,
.driver_data_ptr = &zorro7xx_driver_data[1],
.driver_data_ptr = &zorro7xx_warp_engine_40xx_data,
},
{
.id = ZORRO_PROD_CBM_A4091_1,
.driver_data_ptr = &zorro7xx_driver_data[2],
.driver_data_ptr = &zorro7xx_a4091_data,
},
{
.id = ZORRO_PROD_CBM_A4091_2,
.driver_data_ptr = &zorro7xx_driver_data[2],
.driver_data_ptr = &zorro7xx_a4091_data,
},
{
.id = ZORRO_PROD_GVP_GFORCE_040_060,
.driver_data_ptr = &zorro7xx_driver_data[3],
.driver_data_ptr = &zorro7xx_gforce_040_060_data,
},
{ }
};