platform/x86: p2sb: Make p2sb_get_devfn() return void
p2sb_get_devfn() always succeeds, make it return void and remove error checking from its callers. Reviewed-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Link: https://lore.kernel.org/r/20240305094500.23778-1-hdegoede@redhat.com
This commit is contained in:
@@ -43,7 +43,7 @@ struct p2sb_res_cache {
|
||||
|
||||
static struct p2sb_res_cache p2sb_resources[NR_P2SB_RES_CACHE];
|
||||
|
||||
static int p2sb_get_devfn(unsigned int *devfn)
|
||||
static void p2sb_get_devfn(unsigned int *devfn)
|
||||
{
|
||||
unsigned int fn = P2SB_DEVFN_DEFAULT;
|
||||
const struct x86_cpu_id *id;
|
||||
@@ -53,7 +53,6 @@ static int p2sb_get_devfn(unsigned int *devfn)
|
||||
fn = (unsigned int)id->driver_data;
|
||||
|
||||
*devfn = fn;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static bool p2sb_valid_resource(struct resource *res)
|
||||
@@ -135,9 +134,7 @@ static int p2sb_cache_resources(void)
|
||||
int ret;
|
||||
|
||||
/* Get devfn for P2SB device itself */
|
||||
ret = p2sb_get_devfn(&devfn_p2sb);
|
||||
if (ret)
|
||||
return ret;
|
||||
p2sb_get_devfn(&devfn_p2sb);
|
||||
|
||||
bus = p2sb_get_bus(NULL);
|
||||
if (!bus)
|
||||
@@ -194,17 +191,13 @@ static int p2sb_cache_resources(void)
|
||||
int p2sb_bar(struct pci_bus *bus, unsigned int devfn, struct resource *mem)
|
||||
{
|
||||
struct p2sb_res_cache *cache;
|
||||
int ret;
|
||||
|
||||
bus = p2sb_get_bus(bus);
|
||||
if (!bus)
|
||||
return -ENODEV;
|
||||
|
||||
if (!devfn) {
|
||||
ret = p2sb_get_devfn(&devfn);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
if (!devfn)
|
||||
p2sb_get_devfn(&devfn);
|
||||
|
||||
cache = &p2sb_resources[PCI_FUNC(devfn)];
|
||||
if (cache->bus_dev_id != bus->dev.id)
|
||||
|
||||
Reference in New Issue
Block a user